Updating from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=19485

pkgs/applications/graphics/dia/default.nix

@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "dia-0.97";
 
   src = fetchurl {
-    url = mirror://gnome/pub/gnome/sources/dia/0.97/dia-0.97.tar.bz2;
+    url = mirror://gnome/sources/dia/0.97/dia-0.97.tar.bz2;
     sha256 = "0nngdjklap3x1b7cxnwawh29axbwk8siyq7w4iinsns3slmki0wh";
   };
 
@@ -11,6 +11,9 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Gnome Diagram drawing software.";
-    homepage = http://www.gnome.org/projects/dia;
+    homepage = http://live.gnome.org/Dia;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = with stdenv.lib.platforms;
+      linux;
   };
 }

pkgs/applications/graphics/paraview/default.nix

@@ -1,10 +1,10 @@
 { fetchurl, stdenv, cmake, qt4 }:
 
-stdenv.mkDerivation {
-  name = "paraview-3.6.1";
+stdenv.mkDerivation rec {
+  name = "paraview-3.6.2";
   src = fetchurl {
-    url = http://www.paraview.org/files/v3.6/paraview-3.6.1.tar.gz;
-    sha256 = "1dh0dqbdvjagy122nbwr1gg03ck2if2aqqbvzcpkx38sz12cjh7h";
+    url = "http://www.paraview.org/files/v3.6/${name}.tar.gz";
+    sha256 = "017axalkiaqd13jfbb4awcxvpndnzaq35ys7svm5rnizdwd5hbq6";
   };
 
   preConfigure = ''

pkgs/applications/networking/sync/unison/default.nix

@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation (rec {
 
-  name = "unison-2.27.57";
+  name = "unison-2.32.52";
   src = fetchurl {
-    url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.27.57/unison-2.27.57.tar.gz";
-    sha256 = "49299ec14216a8467b2c6ba148f8145bec31fa787433f9ce3851c2d62f0035ae";
+    url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/${name}/${name}.tar.gz";
+    sha256 = "11844yh1gpjjapn8pvc14hla7g70spwqy6h61qk2is83mpafahhm";
   };
 
   buildInputs = [ocaml makeWrapper];
@@ -22,4 +22,12 @@ stdenv.mkDerivation (rec {
     done
   '';
 
+  meta = {
+    homepage = http://www.cis.upenn.edu/~bcpierce/unison/;
+    description = "Bidirectional file synchronizer";
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+
 })

pkgs/desktops/kde-4.3/support/strigi/default.nix

@@ -2,12 +2,12 @@
 , cluceneCore
 }:
 
-stdenv.mkDerivation {
-  name = "strigi-0.6.4";
+stdenv.mkDerivation rec {
+  name = "strigi-0.7.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/strigi/strigi-0.6.4.tar.bz2;
-    md5 = "324fd9606ac77765501717ff92c04f9a";
+    url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2";
+    sha256 = "1cra4jlpd7cdvckwalfjrf2224qvhbkmxdd3sn02q9jhv830b0yi";
   };
 
   includeAllQtDirs = true;

pkgs/development/compilers/fpc/binary-builder.sh

@@ -2,9 +2,12 @@ source $stdenv/setup
 
 tar xf $src
 tarballdir=$(pwd)
-for i in *.tar; do tar xf $i; done
+for i in *.tar; do tar xvf $i; done
+echo "Deploying binaries.."
 mkdir $out
 cd $out
-for i in $tarballdir/*.gz; do tar xf $i; done
-ln -fs $out/lib/fpc/*/ppc386 $out/bin
-
+for i in $tarballdir/*.gz; do tar xvf $i; done
+echo 'Creating ppc* symlink..'
+for i in $out/lib/fpc/*/ppc*; do
+  ln -fs $i $out/bin/$(basename $i)
+done

pkgs/development/compilers/fpc/default.nix

@@ -25,7 +25,9 @@ stdenv.mkDerivation rec {
   installFlags = "INSTALL_PREFIX=\${out}";
   
   postInstall = ''
-    ln -fs $out/lib/fpc/*/ppc386 $out/bin
+    for i in $out/lib/fpc/*/ppc*; do
+      ln -fs $i $out/bin/$(basename $i)
+    done
     mkdir -p $out/lib/fpc/etc/
     $out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/
   '';

pkgs/development/interpreters/ruby/gem_nix_command.patch

@@ -1,5 +1,5 @@
 diff --git a/lib/rubygems/command_manager.rb b/lib/rubygems/command_manager.rb
-index 0a19016..ef66d30 100644
+index 0a19016..ef66d30 100755
 --- a/lib/rubygems/command_manager.rb
 +++ b/lib/rubygems/command_manager.rb
 @@ -70,6 +70,7 @@ class Gem::CommandManager
@@ -10,12 +10,13 @@ index 0a19016..ef66d30 100644
    end
  
    ##
+
 diff --git a/lib/rubygems/commands/nix_command.rb b/lib/rubygems/commands/nix_command.rb
 new file mode 100644
-index 0000000..005d5a9
+index 0000000..24f3479
 --- /dev/null
 +++ b/lib/rubygems/commands/nix_command.rb
-@@ -0,0 +1,226 @@
+@@ -0,0 +1,229 @@
 +require 'net/http'
 +require 'rubygems/command'
 +require 'rubygems/doc_manager'
@@ -102,7 +103,7 @@ index 0000000..005d5a9
 +          raise Gem::CommandLineError, "could'nt parse arg. expected: name or name-version"
 +        end
 +
-+        print "adding gem_name\n"
++        puts "adding #{gem_name}\n"
 +
 +        adddep(Gem::Dependency.new gem_name, version)
 +      }
@@ -183,8 +184,8 @@ index 0000000..005d5a9
 +    return if @seen[full_name]
 +    @seen[full_name] = true # there maybe circular dependencies. thus mark this gem seen as early as possible
 +
-+    # distinguish runtime / buildtime deps? (TODO)
-+    deps = gem[0].dependencies
++    # development deps can't be found. Some are old. Thus only add rutime dependencies
++    deps = gem[0].dependencies.find_all { |d| d.type == :runtime }
 +
 +    print " total deps of #{full_name}: #{deps.length}\n"
 +
@@ -227,13 +228,16 @@ index 0000000..005d5a9
 +
 +    if cash[src].nil? then
 +      tmp="/tmp/ruby-gems-nix-tmp-file"
-+      raise Gem::DependencyError("could'nt nix-prefetch  #{src}") \
-+	if (not system("nix-prefetch-url #{src.gsub(/([:= `$;])/,'\\\\\1')} > #{tmp} 2>/dev/null")) || $? != 0
-+      file = File.new(tmp)
-+      hash = file.readlines().first().split("\n")[0] # remove trailing \n
-+      file.close()
-+      File.delete(tmp)
-+      cash[src] = hash
++      system("nix-prefetch-url #{src.gsub(/([:= `$;])/,'\\\\\1')} > #{tmp} 2>/dev/null")
++      if $? == 0
++        file = File.new(tmp)
++        hash = file.readlines().first().split("\n")[0] # remove trailing \n
++        file.close()
++        File.delete(tmp)
++        cash[src] = hash
++      else
++        cash[src] = "no hash"
++      end
 +
 +      File.open(cashfile, "w+") do |f| Marshal.dump(cash, f) end
 +    end
@@ -242,3 +246,22 @@ index 0000000..005d5a9
 +  end
 +
 +end
+
+diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
+index d1ef3cb..bf15652 100755
+--- a/lib/rubygems/installer.rb
++++ b/lib/rubygems/installer.rb
+@@ -545,6 +545,13 @@ Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
+ 
+       say path if Gem.configuration.really_verbose
+     end
++
++    if !ENV['NIX_POST_EXTRACT_FILES_HOOK'].nil?
++      print "\nrunning NIX_POST_EXTRACT_FILES_HOOK #{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{@gem_dir}\n"
++      print `#{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{@gem_dir}`
++      print "\nrunning NIX_POST_EXTRACT_FILES_HOOK done\n"
++    end
++
+   end
+ 
+   ##

pkgs/development/interpreters/ruby/gems.nix

@@ -4,22 +4,24 @@ rec {
   # some packages (eg ruby-debug) still require 1.8. So let's stick to that for
   # now if nobody has different requirements
 
-  version = "1.3.4";
+  version = "1.3.5";
   src = fetchurl {
-    url = "http://rubyforge.org/frs/download.php/57643/rubygems-1.3.4.tgz";
-    sha256 = "1z5vvwdf7cwiq669amfxzqd88bn576yq6d9c5c6c92fm9sib1d0y";
+    url = "http://rubyforge.org/frs/download.php/60718/rubygems-1.3.5.tgz";
+    sha256 = "1b26fn9kmyd6394m1gqppi10xyf1hac85lvsynsxzpjlmv0qr4n0";
   };
 
+
   buildInputs = [ruby makeWrapper];
   configureFlags = [];
 
   doInstall = fullDepEntry (''
     ruby setup.rb --prefix=$out/
     wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib:$out/lib
+    find $out -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 
   /* doConfigure should be specified separately */
-  phaseNames = ["doInstall"];
+  phaseNames = ["doPatch" "doInstall"];
       
   name = "rubygems-" + version;
   meta = {

pkgs/development/libraries/libopensc-dnie/default.nix

@@ -5,7 +5,7 @@ zlib}:
 assert opensc.name == "opensc-0.11.7";
 
 stdenv.mkDerivation rec {
-  name = "opensc-dnie-1.4.6-2";
+  name = "libopensc-dnie-1.4.6-2";
   
   src = if (stdenv.system == "i686-linux") then (fetchurl {
       url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_32/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_i386.deb.tar;
@@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
     cp -R usr/share $out
   '';
 
+  passthru = {
+    # This will help keeping the proper opensc version when using this libopensc-dnie library
+    inherit opensc;
+  };
+
   meta = {
     homepage = http://www.dnielectronico.es/descargas/;
     description = "Opensc plugin to access the Spanish national ID smartcard";

pkgs/development/libraries/libyaml/default.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libyaml";
+
+  src = fetchurl {
+    url = http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz;
+    sha256 = "a8bbad7e5250b3735126b7e3bd9f6fce9db19d6be7cc13abad17a24b59ec144a";
+  };
+
+  meta = {
+    homepage = http://pyyaml.org/;
+    description = "A YAML 1.1 parser and emitter written in C";
+    license = "free";
+  };
+}

pkgs/development/python-modules/flup/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, setuptools, ... }:
 
 stdenv.mkDerivation rec {
-  name = "flup-r2311";
+  name = "flup-1.0.2";
 
   src = fetchurl {
     url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz";
-    sha256 = "15wyn6d6wla1ag91yxmlh9b4m0w1i0c2lm8ka4qfv4ijqcqakdx3";
+    sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab";
   };
 
   buildInputs = [ python setuptools ];

pkgs/development/tools/misc/inotify-tools/default.nix

@@ -0,0 +1,19 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "inotify-tools-3.13";
+
+  src = fetchurl {
+    url = mirror://sourceforge/inotify-tools/inotify-tools/3.13/inotify-tools-3.13.tar.gz;
+    sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6";
+  };
+
+  buildInputs = [];
+
+  meta = {
+    description = "";
+    homepage = http://sourceforge.net/projects/inotify-tools/;
+    license = "GPLv2";
+    maintainers = [args.lib.maintainers.marcweber];
+    platforms = args.lib.platforms.linux;
+  };
+}

pkgs/games/sgt-puzzles/default.nix

@@ -1,17 +1,18 @@
 a :  
 let 
-  fetchurl = a.fetchurl;
+  fetchsvn = a.fetchsvn;
 
   version = a.lib.attrByPath ["version"] "r8541" a; 
   buildInputs = with a; [
-    gtk glib pkgconfig libX11 
+    gtk glib pkgconfig libX11 perl
   ];
 in
 rec {
-  src = fetchurl {
-    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    sha256 = "1m6fybbvlx33786hmgraqxgm1hakfj9bqqszzzpi2ka4spfzj3xl";
-  };
+  src = fetchsvn {
+   url = svn://svn.tartarus.org/sgt/puzzles;
+   rev = "8842";
+   sha256 = "0rx3pxd1ci9x1mlw1jfmwd0fpcyv76vv6jraxfrxcykxx62qg479";
+  } + "/";
 
   inherit buildInputs;
   configureFlags = [];
@@ -20,8 +21,12 @@ rec {
   neededDirs = ["$out/bin" "$out/share" ""];
   extraDoc = ["puzzles.txt"];
 
+  mkMakefiles = a.fullDepEntry ''
+    perl mkfiles.pl
+  '' ["minInit" "doUnpack" "addInputs"];
+
   /* doConfigure should be removed if not needed */
-  phaseNames = ["addInputs" "doExport" "doMakeInstall"];
+  phaseNames = ["addInputs" "doExport" "mkMakefiles" "doMakeInstall"];
 
   doExport = a.noDepEntry ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11"

pkgs/misc/sane-front/default.nix

@@ -8,6 +8,10 @@ stdenv.mkDerivation {
     md5 = "c63bf7b0bb5f530cf3c08715db721cd3";
   };
 
+  preConfigure = ''
+    sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
+  '';
+
   buildInputs = [saneBackends libX11 gtk pkgconfig] ++ 
 	(if (libusb != null) then [libusb] else []);
 }

pkgs/misc/source-and-tags/default.nix

@@ -54,7 +54,7 @@ args: with args; {
                  # tagCmd = "${toString ghcsAndLibs.ghc68.ghc}/bin/hasktags --ignore-close-implementation --ctags `find . -type f -name \"*.*hs\"`; sort tags > \$TAG_FILE"; }
                  # *.*hs.* to catch gtk2hs .hs.pp files
                  tagCmd = "
-                   srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs.*\";`\"
+                   srcs=\"`find . -type f -name \"*.*hs\"; find . -type f -name \"*.*hs*\";`\"
                    [ -z \"$srcs\" ] || {
                     ${toString hasktags}/bin/hasktags-modified --ignore-close-implementation --ctags $srcs
                     sort tags > \$TAG_FILE

pkgs/misc/xsane/default.nix

@@ -8,6 +8,10 @@ stdenv.mkDerivation {
     sha256 = "0zddar0y76iv4c55qzfmnm819z5hzisr2jwjb60x36v6bdrhcjx5";
   };
 
+  preConfigure = ''
+    sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c
+  '';
+
   buildInputs = [saneBackends saneFrontends libX11 gtk pkgconfig ] ++
 	(if (libusb != null) then [libusb] else []);
 }

pkgs/os-specific/linux/kernel/config-blocks.nix

@@ -32,7 +32,7 @@ rec {
 
       noPAE = ''
         HIGHMEM64G? n
-        PAE n
+        PAE? n
       '';
 
       usefulSubsystems = ''

pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix

@@ -19,6 +19,7 @@ import ../kernel/generic.nix (
 
     kernelPatches = [
       {
+         name = "zen4"; 
          patch = runCommand "2.6.32-zen4.patch" {} "${xz}/bin/lzma -d < ${ fetchurl {
 	   name = "2.6.32-zen4";
            url = "http://downloads.zen-kernel.org/2.6.32/2.6.32-zen4.patch.lzma";

pkgs/tools/cd-dvd/cdrkit/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, libcap, zlib, bzip2}:
 
 stdenv.mkDerivation rec {
-  name = "cdrkit-1.1.9";
+  name = "cdrkit-1.1.10";
 
   src = fetchurl {
     url = "http://cdrkit.org/releases/${name}.tar.gz";
-    sha256 = "18pgak1qh2xsb3sjikfh1hqn27v2ax72nx7r7sjkdw5yqys8mmfm";
+    sha256 = "1r87n4293lk2xgik9x1lvjr86rdsbaldf0d5flx6zb4c0ss90vlb";
   };
 
   buildInputs = [cmake libcap zlib bzip2];

pkgs/tools/security/opensc-dnie-wrapper/default.nix

@@ -0,0 +1,67 @@
+{stdenv, makeWrapper, ed, libopensc_dnie}:
+
+let
+   opensc = libopensc_dnie.opensc;
+in
+stdenv.mkDerivation rec {
+  name = "${opensc.name}-dnie-wrapper";
+
+  buildInputs = [ makeWrapper ];
+  
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    ensureDir $out/etc
+    cp ${opensc}/etc/opensc.conf $out/etc
+    chmod +w $out/etc/opensc.conf
+
+    # NOTE: The libopensc-dnie.so driver requires /usr/bin/pinentry available, to sign
+
+    ${ed}/bin/ed $out/etc/opensc.conf << EOF
+    /card_drivers
+    a
+    card_drivers = dnie;
+    card_driver dnie {
+      module = ${libopensc_dnie}/lib/libopensc-dnie.so;
+    }
+    .
+    w
+    q
+    EOF
+
+    # Disable pkcs15 file caching, otherwise the card does not work
+    sed -i 's/use_caching = true/use_caching = false/' $out/etc/opensc.conf
+
+    for a in ${opensc}/bin/*; do
+      makeWrapper $a $out/bin/`basename $a` \
+        --set OPENSC_CONF $out/etc/opensc.conf
+    done
+
+    # Special wrapper for pkcs11-tool, which needs an additional parameter
+    rm $out/bin/pkcs11-tool
+    makeWrapper ${opensc}/bin/pkcs11-tool $out/bin/pkcs11-tool \
+      --set OPENSC_CONF $out/etc/opensc.conf \
+      --add-flags "--module ${opensc}/lib/opensc-pkcs11.so"
+
+    # Add, as bonus, a wrapper for the firefox in the PATH, that loads the
+    # proper opensc configuration.
+    cat > $out/bin/firefox-dnie << EOF
+    #!${stdenv.shell}
+    export OPENSC_CONF=$out/etc/opensc.conf
+    exec firefox
+    EOF
+    chmod +x $out/bin/firefox-dnie
+  '';
+
+  meta = {
+    description = "Access to the opensc tools and firefox using the Spanish national ID SmartCard";
+    longDescription = ''
+      Opensc needs a special configuration and special drivers to use the SmartCard
+      the Spanish governement provides to the citizens as ID card.
+      Some wrapper scripts take care for the proper opensc configuration to be used, in order
+      to access the certificates in the SmartCard through the opensc tools or firefox.
+      Opensc will require a pcscd daemon running, managing the access to the card reader.
+    '';
+    maintainers = with stdenv.lib.maintainers; [viric];
+  };
+}

pkgs/tools/security/opensc/0.11.7.nix

@@ -1,5 +1,5 @@
 {stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite, libassuan, pkgconfig,
-libXt}:
+libXt, pinentry}:
 
 stdenv.mkDerivation rec {
   name = "opensc-0.11.7";
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [ "--enable-pcsc" "--enable-nsplugin"
-    "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1" ];
+    "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1"
+    "--with-pinentry=${pinentry}/bin/pinentry" ];
 
   buildInputs = [ libtool readline zlib openssl pcsclite libassuan pkgconfig
     libXt ] ++

pkgs/tools/system/at/default.nix

@@ -1,12 +1,12 @@
 { fetchurl, stdenv, bison, flex, pam, ssmtp }:
 
 stdenv.mkDerivation {
-  name = "at-3.1.11";
+  name = "at-3.1.12";
 
   src = fetchurl {
     # Debian is apparently the last location where it can be found.
-    url = mirror://debian/pool/main/a/at/at_3.1.11.orig.tar.gz;
-    sha256 = "0n995h57x87xg10n8rkq06lynnb3syynfngwspfg91cp22cphycb";
+    url = mirror://debian/pool/main/a/at/at_3.1.12.orig.tar.gz;
+    sha256 = "1wqqrj4lg2ix79ib5kz7lk4hbs1zpw72n6zkd2gdv2my9ymwcmbw";
   };
 
   patches = [ ./install.patch ];

pkgs/top-level/all-packages.nix

@@ -1191,12 +1191,16 @@ let
 
   opensc_0_11_7 = import ../tools/security/opensc/0.11.7.nix {
     inherit fetchurl stdenv libtool readline zlib openssl libiconv pcsclite
-      libassuan pkgconfig;
+      libassuan pkgconfig pinentry;
     inherit (xlibs) libXt;
   };
 
   opensc = opensc_0_11_7;
 
+  opensc_dnie_wrapper = import ../tools/security/opensc-dnie-wrapper {
+    inherit stdenv makeWrapper ed libopensc_dnie;
+  };
+
   openssh = import ../tools/networking/openssh {
     inherit fetchurl stdenv zlib openssl pam perl;
     pamSupport = getPkgConfig "openssh" "pam" true;
@@ -2969,6 +2973,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  inotifyTools = import ../development/tools/misc/inotify-tools {
+    inherit fetchurl stdenv lib;
+  };
+
   jikespg = import ../development/tools/parsing/jikespg {
     inherit fetchurl stdenv;
   };
@@ -4396,6 +4404,10 @@ let
     inherit fetchurl stdenv;
   });
 
+  libyaml = import ../development/libraries/libyaml {
+    inherit fetchurl stdenv;
+  };
+
   libzip = import ../development/libraries/libzip {
     inherit fetchurl stdenv zlib;
   };
@@ -4557,7 +4569,7 @@ let
       pkgconfig;
   };
 
-  opensc_dnie = import ../development/libraries/opensc-dnie {
+  libopensc_dnie = import ../development/libraries/libopensc-dnie {
     inherit fetchurl stdenv patchelf writeScript openssl openct
       libtool pcsclite zlib;
     inherit (gtkLibs) glib;
@@ -4675,7 +4687,8 @@ let
       inputproto fixesproto libXfixes;
     inherit (gnome) glib;
   };
-  qtscriptgenerator = import ../development/libraries/qtscriptgenerator {
+
+  qtscriptgenerator = makeOverridable (import ../development/libraries/qtscriptgenerator) {
     inherit stdenv fetchurl;
     qt4 = qt45;
   };
@@ -8339,7 +8352,7 @@ let
 
   sgtpuzzles = builderDefsPackage (import ../games/sgt-puzzles) {
     inherit (gtkLibs) gtk glib;
-    inherit pkgconfig;
+    inherit pkgconfig fetchsvn perl;
     inherit (xlibs) libX11;
   };
 

pkgs/top-level/python-packages.nix

@@ -57,7 +57,7 @@ rec {
     name = "dateutil-1.4.1";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/p/python-dateutil/${name}.tar.gz";
+      url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz";
       sha256 = "0mrkh932k8s74h4rpgksvpmwbrrkq8zn78gbgwc22i2vlp31bdkl";
     };
 
@@ -409,6 +409,24 @@ rec {
     };
   });
 
+  pyyaml = buildPythonPackage (rec {
+    name = "PyYAML-3.09";
+
+    src = fetchurl {
+      url = "http://pyyaml.org/download/pyyaml/PyYAML-3.09.zip";
+      sha256 = "204aca8b42dbe90e460794d743dd16182011da85507bfd4f092f9f76e0688040";
+    };
+
+    buildInputs = [ pkgs.unzip pkgs.pyrex ];
+    propagatedBuildInputs = [ pkgs.libyaml ];
+
+    meta = {
+      description = "The next generation YAML parser and emitter for Python";
+      homepage = http://pyyaml.org;
+      license = "free"; # !?
+    };
+  });
+
   setuptoolsDarcs = buildPythonPackage {
     name = "setuptools-darcs-1.2.8";