From 04d2aa443e1a7dc29820bdba19f9ea26da8c4f1a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 23 Feb 2012 21:14:19 +0000
Subject: [PATCH 001/109] graphicsmagick-1.3.13 builds with libpng-1.5

svn path=/nixpkgs/trunk/; revision=32523
---
 pkgs/applications/graphics/graphicsmagick/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 0636903d329..6caf0f05c51 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
-, libjpeg, libpng, libtiff, libxml2, zlib, libtool
+, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz
 , libX11}:
 
-let version = "1.3.11"; in
+let version = "1.3.13"; in
 
 stdenv.mkDerivation {
   name = "graphicsmagick-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.bz2";
-    sha256 = "184grcvxa5w0ghiv8zf2vdva0kgp3njf20k3h6lbylspjgd3zhxg";
+    url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
+    sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5";
   };
 
   configureFlags = "--enable-shared";
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
       zlib libtool
     ];
 
+  buildNativeInputs = [ xz ];
+
   postInstall = ''
     sed -i 's/-ltiff.*'\'/\'/ $out/bin/*
   '';

From 722db331a374ac658d377dc41d0585d919e66af9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Feb 2012 21:25:59 +0000
Subject: [PATCH 002/109] * Updated novaclient.

svn path=/nixpkgs/trunk/; revision=32526
---
 pkgs/applications/virtualization/nova/client.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/nova/client.nix b/pkgs/applications/virtualization/nova/client.nix
index 84858c416c8..4a3c730c3cc 100644
--- a/pkgs/applications/virtualization/nova/client.nix
+++ b/pkgs/applications/virtualization/nova/client.nix
@@ -1,12 +1,12 @@
 { fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "novaclient-2.4.3";
+  name = "novaclient-2012.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/p/python-novaclient/python-${name}.tar.gz";
-    md5 = "c4be4adf371d1a84ce1581af365a53d0";
+    md5 = "8f53a308e08b2af4645281917be77ffc";
   };
 
   pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 pythonPackages.ssl ];

From 5f204239480b257270436b09506beb22a6cda639 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Feb 2012 22:04:54 +0000
Subject: [PATCH 003/109] * Fix the VirtualBox build.  It was broken since the
 Qt 4.8 update   because Qt 4.8 doesn't propagate dependencies such as "which"
 and   "pkgconfig".  Thanks to Yury for pointing this out. * Also updated
 VirtualBox to 4.1.8.

svn path=/nixpkgs/trunk/; revision=32527
---
 .../virtualization/virtualbox/default.nix     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index d435f53e109..e8f5f637cc3 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,33 +1,37 @@
 { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
+, libXcursor, libXmu, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
 , python, which, alsaLib, curl, gawk
-, xorriso, makeself, perl, jdk
+, xorriso, makeself, perl, jdk, pkgconfig
 }:
 
-let version = "4.1.6"; in
+let version = "4.1.8"; in
 
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "0zmbq0h9g4lamzmxqg281nr9pp88606dxh2dsw6vy1m86g5kfham";
+    sha256 = "1q04825ayynzgh8zl6y038lzxp3jk1a3dxpg6f52kk4vkirdc5pg";
   };
 
-  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ];
+  buildInputs =
+    [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
+      hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
+      pkgconfig which libXmu
+    ];
 
-  patchPhase = "
+  patchPhase = ''
     set -x
     MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
-    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
-        -e 's@MKISOFS --version@MKISOFS -version@' \\
+    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
+        -e 's@MKISOFS --version@MKISOFS -version@' \
         -i configure
     ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
     ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 
     find . -type f | xargs sed 's/depmod -a/true/' -i
     export USER=nix
     set +x
-  ";
+  '';
 
   configurePhase = ''
     ./configure --with-qt4-dir=${qt4} --disable-python --disable-pulse --disable-hardening --with-mkisofs=${xorriso}/bin/xorrisofs

From 0660134750fead0f4a6ac8d9d7bf95821f066b9b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Feb 2012 22:31:09 +0000
Subject: [PATCH 004/109] git: updated to version 1.7.9.2

svn path=/nixpkgs/trunk/; revision=32528
---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 795d43da6da..24390bc3908 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "1.7.8";
+  version = "1.7.9.2";
   svn = subversionClient.override { perlBindings = true; };
 in
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713";
+    sha256 = "bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75";
   };
 
   patches = [ ./docbook2texi.patch ];

From 2c7845859fdcc8db6e44244cf1e049f96c26955a Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 23 Feb 2012 23:47:26 +0000
Subject: [PATCH 005/109] Added the irc proxy "bip".

svn path=/nixpkgs/trunk/; revision=32529
---
 .../networking/irc/bip/default.nix            | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/bip/default.nix

diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix
new file mode 100644
index 00000000000..eaee36b9711
--- /dev/null
+++ b/pkgs/applications/networking/irc/bip/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, bison, flex, autoconf, automake, openssl }:
+
+let
+
+  version = "0.8.8";
+  sha256 = "7ca3fb96f5ee6b76eb398d7ea45344ea24855344ced11632241a33353bba05d7";
+
+  # fetches patches from a gentoo mirror
+  fetchPatch =
+    { file, sha256 }:
+    fetchurl {
+      url = "mirror://gentoo/../gentoo-portage/net-irc/bip/files/${file}";
+      inherit sha256;
+    };
+
+in stdenv.mkDerivation {
+  name = "bip-${version}";
+
+  # fetch sources from debian, because the creator's website provides
+  # the files only via https but with an untrusted certificate.
+  src = fetchurl {
+    url = "mirror://debian/pool/main/b/bip/bip_${version}.orig.tar.gz";
+    inherit sha256;
+  };
+
+  # includes an important security patch
+  patches = map fetchPatch [
+    { file = "bip-0.8.8-configure.patch";
+      sha256 = "286e169745e6cd768f0cb95bbc9589ca2bda497eb06461174549b80a459d901c";
+    }
+    { file = "bip-CVE-2012-0806.patch";
+      sha256 = "e47523095ee1d717c762ca0195520026c6ea2c30d8adcf434d276d42f052d506";
+    }
+    { file = "bip-freenode.patch";
+      sha256 = "a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f";
+    }
+  ];
+
+  configureFlags = [ "--disable-pie" ];
+
+  buildInputs = [ bison flex autoconf automake openssl ];
+
+  meta = {
+    description = "An IRC proxy (bouncer)";
+    homepage = http://bip.milkypond.org/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4af3ac9797c..9c3449a0f32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7034,6 +7034,8 @@ let
 
   irssi = callPackage ../applications/networking/irc/irssi { };
 
+  bip = callPackage ../applications/networking/irc/bip { };
+
   jackmeter = callPackage ../applications/audio/jackmeter { };
 
   jedit = callPackage ../applications/editors/jedit { };

From 70d56e06383cfa6eb547ce7f1882bfcd95b1e813 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Thu, 23 Feb 2012 23:50:56 +0000
Subject: [PATCH 006/109] Fixed autoconfPhase so that it additionally tests if
 ./bootstrap is a file (and not a directory with executable permission) before
 executing it.

svn path=/nixpkgs/trunk/; revision=32530
---
 pkgs/build-support/release/source-tarball.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix
index 16ac0033d93..0475cdf76b7 100644
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (
 
       eval "$preAutoconf"
 
-      if test -x ./bootstrap; then ./bootstrap
+      if test -x ./bootstrap && test -f ./bootstrap; then ./bootstrap
       elif test -x ./bootstrap.sh; then ./bootstrap.sh
       elif test -x ./autogen.sh; then ./autogen.sh
       elif test -x ./autogen ; then ./autogen

From ed813f3955595ffd594570f74f406f3b6319610a Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Fri, 24 Feb 2012 00:17:09 +0000
Subject: [PATCH 007/109] Let 'bbswitch' and 'acpi-call' use the attribute
 kernel.version instead of a nasty 'ls' to determine the kernel version.

svn path=/nixpkgs/trunk/; revision=32531
---
 pkgs/os-specific/linux/acpi-call/default.nix | 8 +++-----
 pkgs/os-specific/linux/bbswitch/default.nix  | 7 +++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index d7c9e2c3695..f9615da0c2f 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -10,16 +10,14 @@ stdenv.mkDerivation {
   };
   
   preBuild = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
     sed -e 's/break/true/' -i test_off.sh
     sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh
-    sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/$kernelVersion@" -i Makefile
+    sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.version}@" -i Makefile
   '';
  
   installPhase = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
-    ensureDir $out/lib/modules/$kernelVersion/misc
-    cp acpi_call.ko $out/lib/modules/$kernelVersion/misc
+    ensureDir $out/lib/modules/${kernel.version}/misc
+    cp acpi_call.ko $out/lib/modules/${kernel.version}/misc
     ensureDir $out/bin
     cp test_off.sh $out/bin/test_discrete_video_off.sh
   '';
diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix
index a8f8a9d33ef..7c5752b4e34 100644
--- a/pkgs/os-specific/linux/bbswitch/default.nix
+++ b/pkgs/os-specific/linux/bbswitch/default.nix
@@ -17,14 +17,13 @@ stdenv.mkDerivation {
   preBuild = ''
     kernelVersion=$(cd ${kernel}/lib/modules && ls)
     substituteInPlace Makefile \
-      --replace "\$(shell uname -r)" "$kernelVersion" \
+      --replace "\$(shell uname -r)" "${kernel.version}" \
       --replace "/lib/modules" "${kernel}/lib/modules"
   '';
  
   installPhase = ''
-    kernelVersion=$(cd ${kernel}/lib/modules && ls)
-    ensureDir $out/lib/modules/$kernelVersion/misc
-    cp bbswitch.ko $out/lib/modules/$kernelVersion/misc
+    ensureDir $out/lib/modules/${kernel.version}/misc
+    cp bbswitch.ko $out/lib/modules/${kernel.version}/misc
 
     ensureDir $out/bin
     tee $out/bin/discrete_vga_poweroff << EOF

From 1b2d50c14f7e1a319e5c167810179a3e0e6397e3 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Fri, 24 Feb 2012 01:35:59 +0000
Subject: [PATCH 008/109] rfkill udev package.

svn path=/nixpkgs/trunk/; revision=32532
---
 pkgs/os-specific/linux/rfkill/rfkill-hook.sh | 19 ++++++++
 pkgs/os-specific/linux/rfkill/udev.nix       | 49 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 3 files changed, 70 insertions(+)
 create mode 100755 pkgs/os-specific/linux/rfkill/rfkill-hook.sh
 create mode 100644 pkgs/os-specific/linux/rfkill/udev.nix

diff --git a/pkgs/os-specific/linux/rfkill/rfkill-hook.sh b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
new file mode 100755
index 00000000000..d07c7298183
--- /dev/null
+++ b/pkgs/os-specific/linux/rfkill/rfkill-hook.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Executes a hook in case of a change to the
+# rfkill state. The hook can be passed as
+# environment variable, or present as executable
+# file.
+
+if [ -z "$RFKILL_STATE" ]; then
+  echo "rfkill-hook: error: RFKILL_STATE variable not set"
+  exit 1
+fi
+
+if [ -x /var/run/current-system/etc/rfkill.hook ]; then
+  exec /var/run/current-system/etc/rfkill.hook
+elif [ ! -z "$RFKILL_HOOK" ]; then
+  exec $RFKILL_HOOK
+else
+  echo "rfkill-hook: $RFKILL_STATE"
+fi
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix
new file mode 100644
index 00000000000..6cf6e4adfa0
--- /dev/null
+++ b/pkgs/os-specific/linux/rfkill/udev.nix
@@ -0,0 +1,49 @@
+{ stdenv }:
+
+# Provides a facility to hook into rfkill changes.
+#
+# Exemplary usage:
+#
+# Add this package to udev.packages, e.g.:
+#   udev.packages = [ pkgs.rfkill_udev ];
+#
+# Add a hook script in the managed etc directory, e.g.:
+#   etc = [
+#     { source = pkgs.writeScript "rtfkill.hook" ''
+#         #!/bin/sh
+#
+#         if [ "$RFKILL_STATE" -eq "1" ]; then
+#           exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-on
+#         else
+#           exec ${config.system.build.upstart}/sbin/initctl emit -n antenna-off
+#         fi
+#       '';
+#       target = "rfkill.hook";
+#     }
+
+# Note: this package does not need the binaries
+# in the rfkill package.
+
+stdenv.mkDerivation {
+  name = "rfkill-udev";
+
+  unpackPhase = "true";
+  dontBuild = true;
+
+  installPhase = ''
+    ensureDir "$out/etc/udev/rules.d/";
+    cat > "$out/etc/udev/rules.d/90-rfkill.rules" << EOF
+      SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" 
+    EOF
+
+    ensureDir "$out/bin/";
+    cp ${./rfkill-hook.sh} "$out/bin/rfkill-hook.sh"
+    chmod +x "$out/bin/rfkill-hook.sh";
+  '';
+
+  meta = {
+    homepage = http://wireless.kernel.org/en/users/Documentation/rfkill;
+    description = "Rules+hook for udev to catch rfkill state changes";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c3449a0f32..b033176ef61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6032,6 +6032,8 @@ let
 
   rfkill = callPackage ../os-specific/linux/rfkill { };
 
+  rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
+
   ralink_fw = callPackage ../os-specific/linux/firmware/ralink { };
 
   rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { };

From 9c06f2b68a7747d0ef05f883bcc08eb70bdea21b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 08:24:12 +0000
Subject: [PATCH 009/109] haskell-monads-tf: added version 0.1.0.0

svn path=/nixpkgs/trunk/; revision=32533
---
 .../libraries/haskell/monads-tf/default.nix     | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/monads-tf/default.nix

diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix
new file mode 100644
index 00000000000..d61922dc508
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monads-tf/default.nix
@@ -0,0 +1,17 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monads-tf";
+  version = "0.1.0.0";
+  sha256 = "1d38rddm9h8crs96zhzj87a3ygix0ipyxy0qcyas88k60fgavg5i";
+  buildDepends = [ transformers ];
+  meta = {
+    description = "Monad classes, using type families";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fa4c6ac4d9b..be48385e5d5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1000,6 +1000,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
 
+  monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
+
   mongoDB = callPackage ../development/libraries/haskell/mongoDB {
     monadControl = self.monadControl_0_2_0_3;
   };

From 7c0fd3beccc2325008e9e6f9c6efae4d037a2f7d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:31:08 +0000
Subject: [PATCH 010/109] haskell-attoparsec-conduit: updated to version
 0.2.0.1

svn path=/nixpkgs/trunk/; revision=32534
---
 .../libraries/haskell/attoparsec-conduit/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index 9a17ef13563..9f58a5af748 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec-conduit";
-  version = "0.2.0";
-  sha256 = "11jcsqyqc33xn980rac7fmdgj99dg4bp75b5whqzpnr67ginjjv9";
+  version = "0.2.0.1";
+  sha256 = "1jxb2zanfmfqdmd5q770r4yz2s0giky9ify6fcsjwc8wiah4aji1";
   buildDepends = [ attoparsec conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From 01efc845249e31e1adf48f73fbb3078a392885da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:31:11 +0000
Subject: [PATCH 011/109] haskell-blaze-builder-conduit: updated to version
 0.2.0.1

svn path=/nixpkgs/trunk/; revision=32535
---
 .../libraries/haskell/blaze-builder-conduit/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index da3bd570e05..ff6f7429c79 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-conduit";
-  version = "0.2.0";
-  sha256 = "13fcxmzw4xz7y271vdf6w6fj6isninjcxnm7h7gbk4yf31wx831r";
+  version = "0.2.0.1";
+  sha256 = "0p6kq43avsf21biskjardv7k47bag16ki2gmwjpk8ram9mwlz0zg";
   buildDepends = [ blazeBuilder conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From e8ee9fa720fd2de710825bccac4aecae4f645aad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:31:14 +0000
Subject: [PATCH 012/109] haskell-pandoc-types: updated to version 1.9.1

svn path=/nixpkgs/trunk/; revision=32536
---
 pkgs/development/libraries/haskell/pandoc-types/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
index 063fe6f45c5..b55c214bb75 100644
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc-types";
-  version = "1.9.0.2";
-  sha256 = "1rqqchxinjk3njgkp73i92q4iz1cl84p56i2fmgj2zn221r0zhyl";
+  version = "1.9.1";
+  sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i";
   buildDepends = [ syb ];
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";

From 1df1758ca279d67b00fb17913222973974b8e772 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:31:16 +0000
Subject: [PATCH 013/109] haskell-zlib-conduit: updated to version 0.2.0.1

svn path=/nixpkgs/trunk/; revision=32537
---
 pkgs/development/libraries/haskell/zlib-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index decdd32676a..1b8d40efe28 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-conduit";
-  version = "0.2.0";
-  sha256 = "1vwan9vglj7xdna3pfw71bcfcp10s4vn6fd6wwdz7wvxrbn52gsk";
+  version = "0.2.0.1";
+  sha256 = "0css7cr9jj6rn829bw8mlbdl0d6iz9ckhsbrlrdcppx8k4gzb4rg";
   buildDepends = [ conduit transformers zlibBindings ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From 4b3e14f5d0ea4dc0182a1fd4b7cd6fa73481de01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:31:19 +0000
Subject: [PATCH 014/109] Deleted deprecated packages:

  haskell-containers-deepseq
  haskell-control-monad-attempt
  haskell-data-object
  haskell-data-object-yaml
  haskell-frown
  haskell-jsonEnumerator
  haskell-neither
  haskell-pool
  haskell-web-routes
  haskell-web-routes-quasi
  haskell-xml-enumerator

svn path=/nixpkgs/trunk/; revision=32538
---
 .../haskell/containers-deepseq/default.nix    | 17 -----------
 .../haskell/control-monad-attempt/default.nix | 18 -----------
 .../haskell/data-object-yaml/default.nix      | 24 ---------------
 .../libraries/haskell/data-object/default.nix | 18 -----------
 .../haskell/jsonEnumerator/default.nix        | 23 --------------
 .../libraries/haskell/neither/default.nix     | 18 -----------
 .../libraries/haskell/pool/default.nix        | 18 -----------
 .../haskell/web-routes-quasi/default.nix      | 20 -------------
 .../libraries/haskell/web-routes/default.nix  | 21 -------------
 .../haskell/xml-enumerator/default.nix        | 24 ---------------
 .../tools/parsing/frown/builder.sh            |  7 -----
 .../tools/parsing/frown/default.nix           | 11 -------
 pkgs/top-level/haskell-packages.nix           | 30 -------------------
 13 files changed, 249 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/containers-deepseq/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/control-monad-attempt/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-object-yaml/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/data-object/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/jsonEnumerator/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/neither/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/pool/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/web-routes-quasi/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/web-routes/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/xml-enumerator/default.nix
 delete mode 100644 pkgs/development/tools/parsing/frown/builder.sh
 delete mode 100644 pkgs/development/tools/parsing/frown/default.nix

diff --git a/pkgs/development/libraries/haskell/containers-deepseq/default.nix b/pkgs/development/libraries/haskell/containers-deepseq/default.nix
deleted file mode 100644
index 1e7630a93e8..00000000000
--- a/pkgs/development/libraries/haskell/containers-deepseq/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, deepseq }:
-
-cabal.mkDerivation (self: {
-  pname = "containers-deepseq";
-  version = "0.1.0.1";
-  sha256 = "0l9d7hj66fygpsbjw6wy4l11c9cw739lvkrypapwihav7jzva541";
-  buildDepends = [ deepseq ];
-  meta = {
-    description = "Provide orphan NFData instances for containers as needed. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix b/pkgs/development/libraries/haskell/control-monad-attempt/default.nix
deleted file mode 100644
index 0450373e8c6..00000000000
--- a/pkgs/development/libraries/haskell/control-monad-attempt/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, attempt, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "control-monad-attempt";
-  version = "0.3.0.1";
-  sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
-  buildDepends = [ attempt transformers ];
-  meta = {
-    homepage = "http://github.com/snoyberg/control-monad-attempt";
-    description = "Monad transformer for attempt. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-object-yaml/default.nix b/pkgs/development/libraries/haskell/data-object-yaml/default.nix
deleted file mode 100644
index 54c2a05f8f1..00000000000
--- a/pkgs/development/libraries/haskell/data-object-yaml/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ cabal, conduit, convertibleText, dataObject, failure, text
-, transformers, yaml
-}:
-
-cabal.mkDerivation (self: {
-  pname = "data-object-yaml";
-  version = "0.3.4.2";
-  sha256 = "18a9r4wfpb7icjb6nji9iy3abq6sxafmsnfwqpnm1nn2nn3fm1ap";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    conduit convertibleText dataObject failure text transformers yaml
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/data-object-yaml";
-    description = "Serialize data to and from Yaml files (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/data-object/default.nix b/pkgs/development/libraries/haskell/data-object/default.nix
deleted file mode 100644
index c1b12ab038f..00000000000
--- a/pkgs/development/libraries/haskell/data-object/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, failure, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "data-object";
-  version = "0.3.1.9";
-  sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
-  buildDepends = [ failure text time ];
-  meta = {
-    homepage = "http://github.com/snoyberg/data-object/tree/master";
-    description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix b/pkgs/development/libraries/haskell/jsonEnumerator/default.nix
deleted file mode 100644
index 1e4629166fa..00000000000
--- a/pkgs/development/libraries/haskell/jsonEnumerator/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ cabal, blazeBuilder, blazeBuilderEnumerator, enumerator
-, jsonTypes, text, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "json-enumerator";
-  version = "0.0.1.2";
-  sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d";
-  buildDepends = [
-    blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text
-    transformers
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/json-enumerator";
-    description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix
deleted file mode 100644
index e5b3e6a8c48..00000000000
--- a/pkgs/development/libraries/haskell/neither/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, failure, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "neither";
-  version = "0.3.1";
-  sha256 = "1n00v2xs2ghm273barc3bbi67wgpvyihhgl1ij7qczyp9fhqlyfk";
-  buildDepends = [ failure transformers ];
-  meta = {
-    homepage = "http://github.com/snoyberg/neither";
-    description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pool/default.nix b/pkgs/development/libraries/haskell/pool/default.nix
deleted file mode 100644
index fb417a3faf2..00000000000
--- a/pkgs/development/libraries/haskell/pool/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, monadControl, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "pool";
-  version = "0.1.2.1";
-  sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c";
-  buildDepends = [ monadControl transformers ];
-  meta = {
-    homepage = "http://www.yesodweb.com/book/persistent";
-    description = "Thread-safe resource pools. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
deleted file mode 100644
index 7ecc85742e1..00000000000
--- a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ cabal, pathPieces, text }:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes-quasi";
-  version = "0.7.1.1";
-  sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ pathPieces text ];
-  meta = {
-    homepage = "http://docs.yesodweb.com/web-routes-quasi/";
-    description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
deleted file mode 100644
index 270328441e1..00000000000
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text
-, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "web-routes";
-  version = "0.27.1";
-  sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz";
-  buildDepends = [
-    blazeBuilder httpTypes mtl network parsec text utf8String
-  ];
-  meta = {
-    description = "Library for maintaining correctness and composability of URLs within an application";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/xml-enumerator/default.nix b/pkgs/development/libraries/haskell/xml-enumerator/default.nix
deleted file mode 100644
index c891096c205..00000000000
--- a/pkgs/development/libraries/haskell/xml-enumerator/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
-, blazeBuilderEnumerator, dataDefault, enumerator, failure, text
-, transformers, xmlTypes
-}:
-
-cabal.mkDerivation (self: {
-  pname = "xml-enumerator";
-  version = "0.4.4.1";
-  sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj";
-  buildDepends = [
-    attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
-    dataDefault enumerator failure text transformers xmlTypes
-  ];
-  meta = {
-    homepage = "http://github.com/snoyberg/xml";
-    description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/tools/parsing/frown/builder.sh b/pkgs/development/tools/parsing/frown/builder.sh
deleted file mode 100644
index 82689b42d72..00000000000
--- a/pkgs/development/tools/parsing/frown/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-makeFlags="-e PREFIX=\"$out\""
-
-ensureDir $out/bin
-
-genericBuild
diff --git a/pkgs/development/tools/parsing/frown/default.nix b/pkgs/development/tools/parsing/frown/default.nix
deleted file mode 100644
index f94a12e11d1..00000000000
--- a/pkgs/development/tools/parsing/frown/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl, ghc}:
-
-stdenv.mkDerivation {
-  name = "frown-0.6.1";
-  src = fetchurl {
-    url = http://www.informatik.uni-bonn.de/~ralf/frown/frown-0.6.1.tar.gz;
-    md5 = "b6fe9a8bf029c2a7c31b574be05816cf";
-  };
-  builder = ./builder.sh;
-  buildInputs = [ghc];
-}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index be48385e5d5..5fcc1ca607e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -547,10 +547,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
-  containersDeepseq = callPackage ../development/libraries/haskell/containers-deepseq {};
-
-  controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {};
-
   convertible = callPackage ../development/libraries/haskell/convertible {
     time = self.time_1_1_3;
   };
@@ -600,12 +596,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
-  dataObject = callPackage ../development/libraries/haskell/data-object {
-    failure = self.failure_0_1_2;
-  };
-
-  dataObjectYaml = callPackage ../development/libraries/haskell/data-object-yaml {};
-
   dataReify = callPackage ../development/libraries/haskell/data-reify {};
 
   datetime = callPackage ../development/libraries/haskell/datetime {};
@@ -940,8 +930,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   json = callPackage ../development/libraries/haskell/json {};
 
-  jsonEnumerator = callPackage ../development/libraries/haskell/jsonEnumerator {};
-
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
 
   languageJavascript = callPackage ../development/libraries/haskell/language-javascript {
@@ -1033,8 +1021,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
 
-  neither = callPackage ../development/libraries/haskell/neither {};
-
   network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {};
   network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
   network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
@@ -1109,8 +1095,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   polyparse = callPackage ../development/libraries/haskell/polyparse/default.nix {};
 
-  pool = callPackage ../development/libraries/haskell/pool {};
-
   poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};
 
   ppm = callPackage ../development/libraries/haskell/ppm {};
@@ -1450,12 +1434,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   };
   WebBitsHtml = self.WebBitsHtml_1_0_2;
 
-  webRoutes = callPackage ../development/libraries/haskell/web-routes {};
-
-  webRoutesQuasi = callPackage ../development/libraries/haskell/web-routes-quasi {
-    pathPieces = self.pathPieces_0_0_0;
-  };
-
   CouchDB = callPackage ../development/libraries/haskell/CouchDB {};
 
   wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {};
@@ -1481,10 +1459,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {};
 
-  xmlEnumerator = callPackage ../development/libraries/haskell/xml-enumerator {
-    failure = self.failure_0_1_2;
-  };
-
   xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
 
   xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
@@ -1578,10 +1552,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {};
 
-  # 2012-02-09: Disabled because upstream site has disappeared. This tool is clearly
-  #             unmaintained, and we should delete it unless anyone complains.
-  # frown = callPackage ../development/tools/parsing/frown {};
-
   haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {};
   haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
   haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};

From 846da9fb0a019bccee804f80929c2e4df98ce175 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:31:21 +0000
Subject: [PATCH 015/109] haskell-hledger-web: disable this package temporarily
 until it has been upgraded to support recent versions of Yesod

svn path=/nixpkgs/trunk/; revision=32539
---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5fcc1ca607e..90fd84573b1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -844,7 +844,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   #hledgerVty = callPackage ../development/libraries/haskell/hledger-vty {};
   #hledgerChart = callPackage ../development/libraries/haskell/hledger-chart {};
   hledgerInterest = callPackage ../applications/office/hledger-interest {};
-  hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};
+  #hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {};
 
   HList = callPackage ../development/libraries/haskell/HList {};
 

From 3eca3a2f179faf715fd3ceaa184234751760d70e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:38:52 +0000
Subject: [PATCH 016/109] haskell-wai-app-static: updated to version 1.1.2

svn path=/nixpkgs/trunk/; revision=32540
---
 pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index e7197e293f2..79baedeb239 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "1.1.1";
-  sha256 = "0i73rxgmng7grs8cgxw8769jg0cvpsb5gi4s0iwrdyh3xd1vj7iy";
+  version = "1.1.2";
+  sha256 = "1nvzqg3wk7i2p1kcpb9f9wdzbrfl6gxid44l94mmvc7xjcmdl6qw";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
     httpDate httpTypes text time transformers unixCompat wai

From 557c02f29cf62e9920899b4f27ee3ca3dff36320 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:38:55 +0000
Subject: [PATCH 017/109] haskell-wai-extra: updated to version 1.1.0.1

svn path=/nixpkgs/trunk/; revision=32541
---
 .../libraries/haskell/wai-extra/default.nix      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index e0a36878582..734e8a6fe1c 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -1,16 +1,16 @@
-{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, dataDefault, fastLogger, httpTypes, network, text, time
-, transformers, wai, zlibConduit
+{ cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit
+, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes
+, network, text, time, transformers, wai, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "1.1.0";
-  sha256 = "1mj2swb2bgsay9prpw6h0wmwsqyan53ndyczmhppdax4y5088f55";
+  version = "1.1.0.1";
+  sha256 = "0kavvbywkkwj9914y622wsziwfca9qjaqz798mjhl1ip5bfy73b0";
   buildDepends = [
-    blazeBuilder blazeBuilderConduit caseInsensitive conduit
-    dataDefault fastLogger httpTypes network text time transformers wai
-    zlibConduit
+    ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
+    conduit dataDefault fastLogger httpTypes network text time
+    transformers wai zlibConduit
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";

From c24800a05b5e862167954e8a4f953b28fe0b5c52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:38:57 +0000
Subject: [PATCH 018/109] haskell-wai: updated to version 1.1.0.1

svn path=/nixpkgs/trunk/; revision=32542
---
 pkgs/development/libraries/haskell/wai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index f1d4210b667..4fb6227d2e8 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "1.1.0";
-  sha256 = "1kmmivcak9v13rgivs2vhr543dfdx19wncwlpda453570ywam7vh";
+  version = "1.1.0.1";
+  sha256 = "0klyi3d4rivgvbasamxccvkz1w44ak0rcbx840ypdcjq8mbcb85f";
   buildDepends = [
     blazeBuilder conduit httpTypes network text transformers vault
   ];

From 7002f5975160388ace66bfb3a9192c5f0ecec646 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 11:38:59 +0000
Subject: [PATCH 019/109] haskell-warp: updated to version 1.1.0.1

svn path=/nixpkgs/trunk/; revision=32543
---
 .../libraries/haskell/warp/default.nix            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index b6380981d00..03dee23b78b 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,15 +1,16 @@
-{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, httpTypes, liftedBase, network, simpleSendfile
-, transformers, unixCompat, wai
+{ cabal, blazeBuilder, blazeBuilderConduit, bytestringLexing
+, caseInsensitive, conduit, httpTypes, liftedBase, network
+, simpleSendfile, transformers, unixCompat, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "1.1.0";
-  sha256 = "1an2j89422rcvrvrmhg1hwj8vpikjj5xdzb3h37rjsfj6qlqy5cf";
+  version = "1.1.0.1";
+  sha256 = "1bgjnnkqgcyj00jd4rgsnpmac0yfd1ydd6i61b252gyrr9dd0wm9";
   buildDepends = [
-    blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
-    liftedBase network simpleSendfile transformers unixCompat wai
+    blazeBuilder blazeBuilderConduit bytestringLexing caseInsensitive
+    conduit httpTypes liftedBase network simpleSendfile transformers
+    unixCompat wai
   ];
   meta = {
     homepage = "http://github.com/yesodweb/wai";

From 4716f6735d57ea2b6cd126f7351dca2759258401 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Feb 2012 17:32:11 +0000
Subject: [PATCH 020/109] vpnc: install the README file into $out/share/doc

svn path=/nixpkgs/trunk/; revision=32544
---
 pkgs/tools/networking/vpnc/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 34f41272da8..88ef6bd8e59 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -28,17 +28,22 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    for i in $out/{bin,sbin}/*
+    for i in "$out/{bin,sbin}/"*
     do
       wrapProgram $i --prefix PATH :  \
         "${nettools}/bin:${nettools}/sbin"
     done
+
+    mkdir -p $out/share/doc/vpnc
+    cp README nortel.txt ChangeLog $out/share/doc/vpnc/
   '';
 
   meta = {
-    description = ''VPNC, a virtual private network (VPN) client
-                    for Cisco's VPN concentrators'';
-    homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/;
+    homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/";
+    description = "virtual private network (VPN) client for Cisco's VPN concentrators";
     license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From 72450d9b735e7f0d012e21424b4211ecc0f0f098 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Fri, 24 Feb 2012 17:53:19 +0000
Subject: [PATCH 021/109] Added dropbox (binary).

svn path=/nixpkgs/trunk/; revision=32545
---
 .../networking/dropbox/default.nix            | 86 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 88 insertions(+)
 create mode 100644 pkgs/applications/networking/dropbox/default.nix

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
new file mode 100644
index 00000000000..5e7e921710f
--- /dev/null
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -0,0 +1,86 @@
+{ stdenv, fetchurl, makeDesktopItem
+, xlibs, gtkLibs, gnome
+, dbus, dbus_glib, fontconfig, gcc, patchelf
+}:
+
+# this package contains the daemon version of dropbox
+# it's unfortunately closed source
+#
+# note: the resulting program has to be invoced as
+# 'dropbox' because the internal python engine takes
+# uses the name of the program as starting point.
+#
+# todo: dropbox is shipped with some copies of libraries.
+# replace these libraries with the appropriate ones in
+# nixpkgs.
+
+# note: there is a i686 version available as well
+assert stdenv.system == "x86_64-linux";
+
+let
+
+  version = "1.2.52";
+  sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252";
+
+  # relative location where the dropbox libraries are stored
+  sharedir = "share/dropbox";
+
+  # Libraries referenced by dropbox binary.
+  # Be aware that future versions of the dropbox binary may refer
+  # to different versions than are currently in these packages.
+  ldpath = with xlibs; with gtkLibs; with gnome;
+    stdenv.lib.makeSearchPath "lib" [
+      libSM libX11 libXext libXcomposite libXcursor libXdamage
+      libXfixes libXi libXinerama libXrandr libXrender
+      atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf
+      gtk pango
+    ];
+
+  desktopItem = makeDesktopItem {
+    name = "dropbox";
+    exec = "dropbox";
+    comment = "Online directories";
+    desktopName = "Dropbox";
+    genericName = "Online storage";    
+    categories = "Application;Internet;";
+  };
+
+in stdenv.mkDerivation {
+  name = "dropbox-${version}-bin";
+  src = fetchurl {
+    name = "dropbox-${version}.tar.gz";
+    url = "http://www.dropbox.com/download?plat=lnx.x86_64";
+    inherit sha256;
+  };
+
+  sourceRoot = ".";
+
+  patchPhase = ''
+    rm -f .dropbox-dist/dropboxd
+  '';
+
+  installPhase = ''
+    ensureDir "$out/${sharedir}"
+    cp -r .dropbox-dist/* "$out/${sharedir}/"
+    ensureDir "$out/bin"
+    ln -s "$out/${sharedir}/dropbox" "$out/bin/dropbox"
+
+    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
+      "$out/${sharedir}/dropbox"
+
+    RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${sharedir}
+    echo "updating rpaths to: $RPATH"
+    find "$out/${sharedir}" -type f -a -perm +0100 \
+      -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
+
+    ensureDir "$out/share/applications"
+    cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+  buildInputs = [ patchelf ];
+
+  meta = {
+    description = "Online stored folders (daemon version)";
+    homepage = http://www.dropbox.com;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b033176ef61..063e20d175a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7426,6 +7426,8 @@ let
     usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default (the 100% cpu bug)
   };
 
+  dropbox = callPackage ../applications/networking/dropbox { };
+
   slim = callPackage ../applications/display-managers/slim { };
 
   sndBase = builderDefsPackage (import ../applications/audio/snd) {

From d1e84a7498eb73c2f4a48953db5227dfa3e0afd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 24 Feb 2012 20:18:32 +0000
Subject: [PATCH 022/109] Blind commit trying to fix nvidia cg toolkit on
 i686-linux

svn path=/nixpkgs/trunk/; revision=32546
---
 pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 06f1d74382e..083b420318c 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -33,10 +33,9 @@ stdenv.mkDerivation rec {
     ensureDir "$out/include/"
     cp -v -r include/Cg/ "$out/include/"
     ensureDir "$out/lib/"
-    [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
-    [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
-    for mandir in man1 man3 \
-      ${if stdenv.system == "x86_64-linux" then "manCg" else ""} manCgFX
+    [ "$system" == "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
+    [ "$system" == "i686-linux" ] && cp -v lib/* "$out/lib/"
+    for mandir in man1 man3 manCg manCgFX
     do
         ensureDir "$out/share/man/$mandir/"
         cp -v share/man/$mandir/* "$out/share/man/$mandir/"

From 6b10ace1ca7a0eef39c7ff65469057f6a8d41339 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Fri, 24 Feb 2012 20:20:59 +0000
Subject: [PATCH 023/109] mcelog: a tool to access the machine check exceptions
 logged by the kernel.

The kernel indicated that machine check exceptions were logged, but did not tell what kind of exceptions.
In my case, this is usually the processor being throttled because it gets too hot (laptop...), but it
may also be more severe problems. Anyway, with this tool you can access these logs.

svn path=/nixpkgs/trunk/; revision=32547
---
 pkgs/os-specific/linux/mcelog/default.nix | 33 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/os-specific/linux/mcelog/default.nix

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
new file mode 100644
index 00000000000..82c502ede72
--- /dev/null
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit }:
+
+# Shows the machine check exceptions logged by the kernel.
+# E.g. a log is generated when intel processors cpu-throttle.
+
+# The releases of this package are no longer on kernel.org
+# hence we fetch them from github. Apparently, these
+# are also more recent.
+
+let
+
+  rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2";
+  version = "1.0pre-${rev}"; 
+  sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7";
+
+in stdenv.mkDerivation {
+
+  name = "mcelog-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/andikleen/mcelog";
+    inherit sha256;
+    inherit rev;
+  };
+
+  makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc";
+
+  meta = {
+    description = "Tool to display logged machine check exceptions";
+    homepage = http://mcelog.org/;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 063e20d175a..81f42cc55c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -444,6 +444,8 @@ let
 
   syslogng = callPackage ../tools/system/syslog-ng { };
 
+  mcelog = callPackage ../os-specific/linux/mcelog { };
+
   asciidoc = callPackage ../tools/typesetting/asciidoc { };
 
   autossh = callPackage ../tools/networking/autossh { };

From 0812ff0e57c00fd757d29d2290834cb733fc23e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 24 Feb 2012 20:34:35 +0000
Subject: [PATCH 024/109] Adding caelum (I want RoR)

svn path=/nixpkgs/trunk/; revision=32548
---
 pkgs/development/libraries/caelum/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/caelum/default.nix

diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix
new file mode 100644
index 00000000000..68d96f4f373
--- /dev/null
+++ b/pkgs/development/libraries/caelum/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, boost }:
+
+stdenv.mkDerivation rec {
+  name = "caelum-0.6.1";
+
+  src = fetchurl {
+    url = "http://caelum.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1j995q1a88cikqrxdqsrwzm2asid51xbmkl7vn1grfrdadb15303";
+  };
+
+  buildInputs = [ ois ogre boost ];
+  buildNativeInputs = [ cmake pkgconfig ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Add-on for the OGRE, aimed to render atmospheric effects";
+    homepage = http://code.google.com/p/caelum/;
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81f42cc55c8..c2c10d56be1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3276,6 +3276,8 @@ let
 
   buddy = callPackage ../development/libraries/buddy { };
 
+  caelum = callPackage ../development/libraries/caelum { };
+
   cairomm = callPackage ../development/libraries/cairomm { };
 
   scmccid = callPackage ../development/libraries/scmccid { };

From d6f6caea6be6526a8cef8e3c738b8504efb98bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 24 Feb 2012 21:13:14 +0000
Subject: [PATCH 025/109] Updating angelscript to 2.22.1.

Adding mysocketw.

Adding ogre-paged.

Fixing the caelum licence.


svn path=/nixpkgs/trunk/; revision=32549
---
 .../interpreters/angelscript/default.nix      |  4 ++--
 pkgs/development/libraries/caelum/default.nix |  2 +-
 .../libraries/mysocketw/default.nix           | 23 +++++++++++++++++++
 .../development/libraries/mysocketw/gcc.patch | 13 +++++++++++
 .../libraries/ogrepaged/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 6 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/mysocketw/default.nix
 create mode 100644 pkgs/development/libraries/mysocketw/gcc.patch
 create mode 100644 pkgs/development/libraries/ogrepaged/default.nix

diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index 65ff72bae56..fa53071d306 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="angelscript";
-    version="2.20.2";
+    version="2.22.1";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    hash="0s5d6av27dl6kxkzns011zwznj7r8zy5ypfhl6x9r1kzaqdkqz2a";
+    hash="0fmw0cb7ymgyq31r4cfvsn4k86r20hj650fbzs9i7zl0p3lb6hpm";
   };
 in
 rec {
diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix
index 68d96f4f373..75eb5109b45 100644
--- a/pkgs/development/libraries/caelum/default.nix
+++ b/pkgs/development/libraries/caelum/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Add-on for the OGRE, aimed to render atmospheric effects";
     homepage = http://code.google.com/p/caelum/;
-    license = "LGPLv2+";
+    license = "LGPLv2.1+";
   };
 }
diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix
new file mode 100644
index 00000000000..c1cada63abe
--- /dev/null
+++ b/pkgs/development/libraries/mysocketw/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "mysocketw-031026";
+  src = fetchurl {
+    url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz;
+    sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4";
+  };
+
+  patches = [ ./gcc.patch ];
+
+  configurePhase = ''
+    sed -i s,/usr/local,$out, Makefile.conf
+  '';
+
+  buildInputs = [ openssl ];
+
+  meta = {
+    description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
+    license = "LGPLv2.1+";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/mysocketw/gcc.patch b/pkgs/development/libraries/mysocketw/gcc.patch
new file mode 100644
index 00000000000..7779a18fa52
--- /dev/null
+++ b/pkgs/development/libraries/mysocketw/gcc.patch
@@ -0,0 +1,13 @@
+I picked it up from:
+http://www.rigsofrods.com/wiki/images/c/c0/Socketw.patch
+
+--- a/src/sw_base.cxx.old	2009-12-19 21:19:31.057051328 -0800
++++ b/src/sw_base.cxx	2009-12-19 21:19:44.939551918 -0800
+@@ -19,6 +19,7 @@
+ #include <time.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #ifndef __WIN32__
+   #include <netdb.h>
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix
new file mode 100644
index 00000000000..6b2b9c9e4a6
--- /dev/null
+++ b/pkgs/development/libraries/ogrepaged/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }:
+
+stdenv.mkDerivation rec {
+  name = "ogre-paged-1.1.3";
+
+  src = fetchurl {
+    url = "http://ogre-paged.googlecode.com/files/${name}.tar.gz";
+    sha256 = "1qqlkg17plk87dm3fsm34x8lkd5rxkhiz77ppcgc71a7z050vhjq";
+  };
+
+  buildInputs = [ ois ogre libX11 boost ];
+  buildNativeInputs = [ cmake pkgconfig ];
+
+  cmakeFlags = "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Paged Geometry for Ogre3D";
+    homepage = http://code.google.com/p/ogre-paged/;
+    license = "MIT";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2c10d56be1..6792996dbf4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4371,6 +4371,8 @@ let
 
   myguiSvn = callPackage ../development/libraries/mygui/svn.nix {};
 
+  mysocketw = callPackage ../development/libraries/mysocketw { };
+
   ncurses = makeOverridable (import ../development/libraries/ncurses) {
     inherit fetchurl stdenv;
     unicode = system != "i686-cygwin";
@@ -4416,6 +4418,8 @@ let
 
   ogre = callPackage ../development/libraries/ogre {};
 
+  ogrepaged = callPackage ../development/libraries/ogrepaged { };
+
   openal = callPackage ../development/libraries/openal { };
 
   # added because I hope that it has been easier to compile on x86 (for blender)

From d3d5783466abc8a9868039cb52457ceb8275499a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 24 Feb 2012 22:05:47 +0000
Subject: [PATCH 026/109] Updating and fixing rigsofrods, to 0.39.4. Pay
 attention to the last 'echo' of installPhase.

svn path=/nixpkgs/trunk/; revision=32550
---
 pkgs/games/rigsofrods/default.nix | 55 ++++++++++++++-----------------
 pkgs/games/rigsofrods/wx.patch    | 13 --------
 2 files changed, 24 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/games/rigsofrods/wx.patch

diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 8fc623184ed..13d6159528a 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -1,21 +1,15 @@
 { fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost, 
   pkgconfig, libuuid, lua5, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
-  angelscript
+  angelscript, caelum, ogrepaged, mysocketw, libxcb
   }:
 
 stdenv.mkDerivation rec {
-  /* version = "1780"; */
-  version = "0.37";
+  version = "0.39.4";
   name = "rigsofrods-${version}";
 
-  /* src = fetchsvn {
-    url = https://rigsofrods.svn.sourceforge.net/svnroot/rigsofrods/trunk;
-    rev = version;
-  }; */
-  
   src = fetchurl {
-    url = mirror://sourceforge/rigsofrods/rigsofrods/0.37-dev/RoR-0.37.126-Sources.zip;
-    sha256 = "03mxmxpfdlsri0j3nqgyj2pc4gpzs8zq8qgg6qhnyazi7j95j4mk";
+    url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2;
+    sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx";
   };
 
   contentPackSrc = fetchurl {
@@ -26,45 +20,44 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   cmakeFlags = [
-    "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a"
+    # "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a"
     "-DROR_USE_CURL=TRUE"
     "-DROR_USE_MYGUI=TRUE"
-    # "-DROR_USE_OPNEAL=TRUE"
-    # "-DROR_USE_MOFILEREADER=TRUE"
-    # "-DROR_USE_CAELUM=TRUE"
-    # "-DROR_USE_PAGED=TRUE"
+    "-DROR_USE_OPNEAL=TRUE"
+    "-DROR_USE_CAELUM=TRUE"
+    "-DROR_USE_PAGED=TRUE"
     "-DROR_USE_ANGELSCRIPT=TRUE"
-    # "-DROR_USE_SOCKETW=TRUE"
+    "-DROR_USE_SOCKETW=TRUE"
   ];
+  makeFlags = "VERBOSE=1";
 
   installPhase = ''
-    sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../bin/plugins.cfg
-    sed -e "/CgProgramManager/d" -i ../bin/plugins.cfg
+    sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
     ensureDir $out/share/rigsofrods
     cp -r .. $out/share/rigsofrods/build-dir
+    cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods/build-dir/bin
     ensureDir $out/bin
-    for i in RoR rorconfig RoRViewer; do
-      echo '#! ${stdenv.shell}' >> "$out/bin/$i"
-      if [ "$i" = "rorconfig" ]; then
-        echo "[ -d \"\$HOME/.rigsofrods\" ] && cp -r '$out/share/rigsofrods/build-dirs/bin/skeleton' \"\$HOME/.rigsofrods\"" >> "$out/bin/$i"
-        echo "chmod u+w -R \"\$HOME/.rigsofrods\"" >> "$out/bin/$i"
-      fi
-      echo "\"$out/share/rigsofrods/build-dir/bin/$i\"" >> "$out/bin/$i"
-      chmod a+x "$out/bin/$i"
-    done
-    cd $out/share/rigsofrods/build-dir/bin/
+    ln -s $out/share/rigsofrods/build-dir/bin/{RoR,rorconfig} $out/bin
+    cd $out/share/rigsofrods
+    mkdir contentpack
+    cd contentpack
     unzip "${contentPackSrc}"
+
+    echo First run rorconfig once to create ~/.rigsofrods
+    echo Then copy $out/share/rigsofrods/build-dir/bin/plugins.cfg to ~/.rigsofrods
+    echo Then ln $out/share/rigsofrods/contentpack/* to ~/.rigsofrods/packs
   '';
 
+  patches = [ ./doubleslash.patch ];
+
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -langelscript -lgtk-x11-2.0"
     sed -e 's@wxLOCALE_CONV_ENCODING@0@g' -i source/configurator/configurator.cpp
   '';
 
-  # patches = [ ./wx.patch ];
-
   buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig
-    libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript ];
+    libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript
+    caelum ogrepaged mysocketw libxcb ];
 
   meta = {
     description = "3D simulator game where you can drive, fly and sail various vehicles";
diff --git a/pkgs/games/rigsofrods/wx.patch b/pkgs/games/rigsofrods/wx.patch
deleted file mode 100644
index d5b8e27de7b..00000000000
--- a/pkgs/games/rigsofrods/wx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/source/configurator/configurator.cpp b/source/configurator/configurator.cpp
-index c058820..5a4b316 100644
---- a/source/configurator/configurator.cpp
-+++ b/source/configurator/configurator.cpp
-@@ -2155,7 +2155,7 @@ void MyDialog::OnsightrangesliderScroll(wxScrollEvent &e)
- 	int v = sightRange->GetValue();
- 	if(v == sightRange->GetMax())
- 	{
--		s = "Unlimited";
-+		s = _("Unlimited");
- 	} else
- 	{
- 		s.Printf(wxT("%i m"), v);

From ded053529f36639580dc53e8bc3c240b7e110a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 24 Feb 2012 22:09:07 +0000
Subject: [PATCH 027/109] A patch required for RoR I just forgot.

svn path=/nixpkgs/trunk/; revision=32551
---
 pkgs/games/rigsofrods/doubleslash.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 pkgs/games/rigsofrods/doubleslash.patch

diff --git a/pkgs/games/rigsofrods/doubleslash.patch b/pkgs/games/rigsofrods/doubleslash.patch
new file mode 100644
index 00000000000..c62c5470dfc
--- /dev/null
+++ b/pkgs/games/rigsofrods/doubleslash.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeDependenciesConfig.txt b/CMakeDependenciesConfig.txt
+index 447a440..e2562de 100644
+--- a/CMakeDependenciesConfig.txt
++++ b/CMakeDependenciesConfig.txt
+@@ -228,7 +228,7 @@ ELSEIF(UNIX)
+    # Paged Geometry
+    find_path(PAGED_INCLUDE_DIRS "PagedGeometry/PagedGeometry.h")
+    if(PAGED_INCLUDE_DIRS)
+-      set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};/${PAGED_INCLUDE_DIRS}/PagedGeometry")
++      set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};${PAGED_INCLUDE_DIRS}/PagedGeometry")
+       find_library(PAGED_LIBRARIES "PagedGeometry")
+       set(ROR_USE_PAGED ON)
+    else()

From 60bd341efdefc9e6db6fa7c169eaf54efb19b314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 24 Feb 2012 22:49:41 +0000
Subject: [PATCH 028/109] Trying to fix go-oo

svn path=/nixpkgs/trunk/; revision=32552
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6792996dbf4..7b4cf34d948 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7278,6 +7278,7 @@ let
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2;
     neon = neon029;
+    libwpd = libwpd_08;
   };
 
   openscad = callPackage ../applications/graphics/openscad {};

From 6f7cb59e04d4b75a6799d8c82bc4ad8ef7331a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 24 Feb 2012 22:56:53 +0000
Subject: [PATCH 029/109] Making rigs of rods build and run right away. Simpyl
 run 'rorconfig' first, and 'RoR' then. On linux, disable Caleum rendering. It
 does not work. Known bug upstream.

svn path=/nixpkgs/trunk/; revision=32553
---
 pkgs/games/rigsofrods/default.nix | 27 ++++++++-------------------
 pkgs/games/rigsofrods/paths.patch | 12 ++++++++++++
 2 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/games/rigsofrods/paths.patch

diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 13d6159528a..480481afe9a 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -1,5 +1,5 @@
 { fetchsvn, fetchurl, stdenv, wxGTK290, freeimage, cmake, zziplib, mesa, boost, 
-  pkgconfig, libuuid, lua5, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
+  pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
   angelscript, caelum, ogrepaged, mysocketw, libxcb
   }:
 
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   cmakeFlags = [
-    # "-DROR_USE_LUA=TRUE" "-DLUA_LIBRARIES=${lua5}/lib/liblua.a"
     "-DROR_USE_CURL=TRUE"
     "-DROR_USE_MYGUI=TRUE"
     "-DROR_USE_OPNEAL=TRUE"
@@ -29,34 +28,24 @@ stdenv.mkDerivation rec {
     "-DROR_USE_ANGELSCRIPT=TRUE"
     "-DROR_USE_SOCKETW=TRUE"
   ];
-  makeFlags = "VERBOSE=1";
 
   installPhase = ''
     sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
     ensureDir $out/share/rigsofrods
-    cp -r .. $out/share/rigsofrods/build-dir
-    cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods/build-dir/bin
+    cp -r ../bin/* $out/share/rigsofrods
+    cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods
     ensureDir $out/bin
-    ln -s $out/share/rigsofrods/build-dir/bin/{RoR,rorconfig} $out/bin
+    ln -s $out/share/rigsofrods/{RoR,rorconfig} $out/bin
     cd $out/share/rigsofrods
-    mkdir contentpack
-    cd contentpack
+    mkdir packs
+    cd packs
     unzip "${contentPackSrc}"
-
-    echo First run rorconfig once to create ~/.rigsofrods
-    echo Then copy $out/share/rigsofrods/build-dir/bin/plugins.cfg to ~/.rigsofrods
-    echo Then ln $out/share/rigsofrods/contentpack/* to ~/.rigsofrods/packs
   '';
 
-  patches = [ ./doubleslash.patch ];
-
-  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -langelscript -lgtk-x11-2.0"
-    sed -e 's@wxLOCALE_CONV_ENCODING@0@g' -i source/configurator/configurator.cpp
-  '';
+  patches = [ ./doubleslash.patch ./paths.patch ];
 
   buildInputs = [ wxGTK290 freeimage cmake zziplib mesa boost pkgconfig
-    libuuid lua5 openal ogre ois curl gtk mygui unzip angelscript
+    libuuid openal ogre ois curl gtk mygui unzip angelscript
     caelum ogrepaged mysocketw libxcb ];
 
   meta = {
diff --git a/pkgs/games/rigsofrods/paths.patch b/pkgs/games/rigsofrods/paths.patch
new file mode 100644
index 00000000000..e20b00a7693
--- /dev/null
+++ b/pkgs/games/rigsofrods/paths.patch
@@ -0,0 +1,12 @@
+diff --git a/source/main/framework/ContentManager.cpp b/source/main/framework/ContentManager.cpp
+index 0bfea8c..82cdab9 100644
+--- a/source/main/framework/ContentManager.cpp
++++ b/source/main/framework/ContentManager.cpp
+@@ -238,6 +238,7 @@ bool ContentManager::init(void)
+ #endif // USE_OPENAL
+ 
+ 	// and the content
++	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("Program Path")+"packs", "FileSystem", "Packs", true);
+ 	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"packs", "FileSystem", "Packs", true);
+ 	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"mods",  "FileSystem", "Packs", true);
+ 

From bfd787a69a4bf8c2b170063f3b9416f0df24ddf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 24 Feb 2012 23:40:58 +0000
Subject: [PATCH 030/109] Finally I fix, not blindly, the nvidia-cg-toolkit
 expression for i686-linux

svn path=/nixpkgs/trunk/; revision=32554
---
 pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 083b420318c..d6b7d70100b 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     for b in cgc cgfxcat cginfo
     do
-        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b"
+        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux*.so.? "bin/$b"
     done
     # FIXME: cgfxcat and cginfo need more patchelf
     ensureDir "$out/bin/"

From bfb0389d6cf2caa6f017f11f9fd9a488713b89f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 25 Feb 2012 15:54:57 +0000
Subject: [PATCH 031/109] Disabling NLS for the zip at openoffice builders. I
 think it breaks the builds, based on the nixpkgs diff for the breakage at
 http://hydra.nixos.org/build/1964660 .

svn path=/nixpkgs/trunk/; revision=32556
---
 pkgs/tools/archivers/zip/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix      | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index e3b48f48325..c7bddfd6de2 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libnatspec }:
+{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null }:
+
+assert enableNLS -> libnatspec != null;
 
 stdenv.mkDerivation {
   name = "zip-3.0";
@@ -12,9 +14,9 @@ stdenv.mkDerivation {
 
   installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp";
 
-  patches = [ ./natspec-gentoo.patch.bz2 ];
+  patches = if enableNLS then [ ./natspec-gentoo.patch.bz2 ] else [];
 
-  buildInputs = [ libnatspec ];
+  buildInputs = if enableNLS then [ libnatspec ] else [];
 
   meta = {
     homepage = http://www.info-zip.org;
@@ -22,4 +24,3 @@ stdenv.mkDerivation {
     maintainer = [ stdenv.lib.maintainers.urkud ];
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b4cf34d948..99fb330bec3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7272,6 +7272,7 @@ let
     inherit (gnome) GConf ORBit2;
     neon = neon029;
     libwpd = libwpd_08;
+    zip = zip.override { enableNLS = false; };
   };
 
   go_oo = callPackage ../applications/office/openoffice/go-oo.nix {
@@ -7279,6 +7280,7 @@ let
     inherit (gnome) GConf ORBit2;
     neon = neon029;
     libwpd = libwpd_08;
+    zip = zip.override { enableNLS = false; };
   };
 
   openscad = callPackage ../applications/graphics/openscad {};

From 675e16f8054ce0e6e9d69dfb8eba61c1f4a6141a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 25 Feb 2012 16:47:21 +0000
Subject: [PATCH 032/109] Fixing jam for i686-linux. That should allow building
 trigger rally.

svn path=/nixpkgs/trunk/; revision=32557
---
 pkgs/development/tools/build-managers/jam/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index d2a002a70cf..6e2d79c6400 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -1,5 +1,11 @@
 {stdenv, fetchurl}:
 
+let
+  bindir = if stdenv.system == "i686-linux" then "bin.linuxx86"
+    else if stdenv.system == "x86_64-linux" then "bin.linux"
+    else throw "Unsupported platform by now";
+in
+
 stdenv.mkDerivation {
   name = "jam-2.5";
   src = fetchurl {
@@ -9,7 +15,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     ensureDir $out/bin
-    cp bin.linux/jam $out/bin
+    cp ${bindir}/jam $out/bin
   '';
 
   meta = {

From 5f78cfa108a856b35136ada20be2a8cac26280cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Feb 2012 17:33:14 +0000
Subject: [PATCH 033/109] * Add "..." to the trace message.

svn path=/nixpkgs/trunk/; revision=32559
---
 pkgs/lib/debug.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/lib/debug.nix b/pkgs/lib/debug.nix
index d4d2702a284..e452151add6 100644
--- a/pkgs/lib/debug.nix
+++ b/pkgs/lib/debug.nix
@@ -42,7 +42,7 @@ rec {
       else if x == null then "x is null"
       else if isInt x then "x is an integer `${toString x}'"
       else if isString x then "x is a string `${substring 0 50 x}...'"
-      else "x is probably a path `${substring 0 50 (toString x)}'";
+      else "x is probably a path `${substring 0 50 (toString x)}...'";
 
   # trace the arguments passed to function and its result 
   # maybe rewrite these functions in a traceCallXml like style. Then one function is enough

From f0197c653e4601776128061d7624ded313c059fd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Feb 2012 17:34:21 +0000
Subject: [PATCH 034/109] * Backport a fix to qemu-kvm to prevent "qemu-img
 convert" from   creating corrupt VirtualBox images.  
 (https://bugs.launchpad.net/qemu/+bug/919242)

svn path=/nixpkgs/trunk/; revision=32560
---
 pkgs/os-specific/linux/qemu-kvm/default.nix   |  2 +-
 .../qemu-kvm/qemu-img-fix-corrupt-vdi.patch   | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch

diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 821084c1b33..aa92b2f2d0d 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gkk96yid3nq8i4z8xbiarj0r9v7b2zavf5mnh0rc7kclzxa7mmf";
   };
 
-  patches = [ ./smb-tmpdir.patch ];
+  patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
 
   configureFlags = "--audio-drv-list=alsa";
 
diff --git a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch
new file mode 100644
index 00000000000..446a69a146b
--- /dev/null
+++ b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch
@@ -0,0 +1,27 @@
+From http://patchwork.ozlabs.org/patch/137186/
+
+diff -ru qemu-kvm-0.15.1-orig/block/vdi.c qemu-kvm-0.15.1/block/vdi.c
+--- qemu-kvm-0.15.1-orig/block/vdi.c	2011-10-19 15:54:48.000000000 +0200
++++ qemu-kvm-0.15.1/block/vdi.c	2012-02-25 18:15:36.114574574 +0100
+@@ -1,7 +1,7 @@
+ /*
+  * Block driver for the Virtual Disk Image (VDI) format
+  *
+- * Copyright (c) 2009 Stefan Weil
++ * Copyright (c) 2009, 2012 Stefan Weil
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -767,8 +767,12 @@
+             acb->header_modified = 1;
+         }
+         acb->bmap_last = block_index;
++        /* Copy data to be written to new block and zero unused parts. */
++        memset(block, 0, sector_in_block * SECTOR_SIZE);
+         memcpy(block + sector_in_block * SECTOR_SIZE,
+                acb->buf, n_sectors * SECTOR_SIZE);
++        memset(block + (sector_in_block + n_sectors) * SECTOR_SIZE, 0,
++               (s->block_sectors - n_sectors - sector_in_block) * SECTOR_SIZE);
+         acb->hd_iov.iov_base = (void *)block;
+         acb->hd_iov.iov_len = s->block_size;
+         qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1);

From f25daaaf3d069bfce0716c599d6acf197eae2952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 25 Feb 2012 18:29:30 +0000
Subject: [PATCH 035/109] Rigs of rods was built without optimisations. Setting
 the cmake build type to release.

I think that should be done at the cmake setup hook, and win that for all
possible cmake packages that are built by default without optimisation flags.
Which is the cmake default behaviour if not overriden.


svn path=/nixpkgs/trunk/; revision=32561
---
 pkgs/games/rigsofrods/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 480481afe9a..4fa89798306 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     "-DROR_USE_PAGED=TRUE"
     "-DROR_USE_ANGELSCRIPT=TRUE"
     "-DROR_USE_SOCKETW=TRUE"
+    "-DCMAKE_BUILD_TYPE=Release"
   ];
 
   installPhase = ''

From 9e7a5c5157859edc49bfb6eee0bb249889010d9f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 25 Feb 2012 19:22:06 +0000
Subject: [PATCH 036/109] boost: updated to version 1.49

svn path=/nixpkgs/trunk/; revision=32562
---
 pkgs/development/libraries/boost/1.49.nix     | 91 +++++++++++++++++++
 .../boost/boost_filesystem_post_1_49_0.patch  | 12 +++
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/boost/1.49.nix
 create mode 100644 pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch

diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix
new file mode 100644
index 00000000000..a86670927aa
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.49.nix
@@ -0,0 +1,91 @@
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
+, enableRelease ? true
+, enableDebug ? false
+, enableSingleThreaded ? false
+, enableMultiThreaded ? true
+, enableShared ? true
+, enableStatic ? false
+, enablePIC ? false
+, enableExceptions ? false
+}:
+
+let
+
+  variant = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableRelease "release" ++
+     stdenv.lib.optional enableDebug "debug");
+
+  threading = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableSingleThreaded "single" ++
+     stdenv.lib.optional enableMultiThreaded "multi");
+
+  link = stdenv.lib.concatStringsSep ","
+    (stdenv.lib.optional enableShared "shared" ++
+     stdenv.lib.optional enableStatic "static");
+
+  # To avoid library name collisions
+  finalLayout = if ((enableRelease && enableDebug) ||
+    (enableSingleThreaded && enableMultiThreaded) ||
+    (enableShared && enableStatic)) then
+    "tagged" else "system";
+
+  cflags = if (enablePIC && enableExceptions) then
+             "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
+           else if (enablePIC) then
+             "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
+           else if (enableExceptions) then
+             "cflags=-fexceptions"
+           else
+             "";
+in
+
+stdenv.mkDerivation {
+  name = "boost-1.49.0";
+
+  meta = {
+    homepage = "http://boost.org/";
+    description = "Boost C++ Library Collection";
+    license = "boost-license";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2";
+    sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x";
+  };
+
+  # See <http://svn.boost.org/trac/boost/ticket/4688>.
+  patches = [ ./boost_filesystem_post_1_49_0.patch ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = [icu expat zlib bzip2 python];
+
+  configureScript = "./bootstrap.sh";
+  configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
+
+  buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
+
+  installPhase = ":";
+
+  crossAttrs = rec {
+    buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ];
+    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
+    # override them.
+    propagatedBuildInputs = buildInputs;
+    # We want to substitute the contents of configureFlags, removing thus the
+    # usual --build and --host added on cross building.
+    preConfigure = ''
+      export configureFlags="--prefix=$out --without-icu"
+    '';
+    buildPhase = ''
+      set -x
+      cat << EOF > user-config.jam
+      using gcc : cross : $crossConfig-g++ ;
+      EOF
+      ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
+    '';
+  };
+}
diff --git a/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch b/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch
new file mode 100644
index 00000000000..334533d98a6
--- /dev/null
+++ b/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch
@@ -0,0 +1,12 @@
+diff -ubr boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp
+--- boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp	2011-01-11 22:39:33.000000000 +0100
++++ boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp	2012-02-25 20:00:33.628767485 +0100
+@@ -45,7 +45,7 @@
+   {
+ #if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) 
+     // ISO C calls this "the locale-specific native environment":
+-    static std::locale lc("");
++    static std::locale lc;
+ #else  // Mac OS
+     // "All BSD system functions expect their string parameters to be in UTF-8 encoding
+     // and nothing else."
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99fb330bec3..bf6af1326a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3260,7 +3260,8 @@ let
   boost146 = callPackage ../development/libraries/boost/1.46.nix { };
   boost147 = callPackage ../development/libraries/boost/1.47.nix { };
   boost148 = callPackage ../development/libraries/boost/1.48.nix { };
-  boost = boost148;
+  boost149 = callPackage ../development/libraries/boost/1.49.nix { };
+  boost = boost149;
 
   # A Boost build with all library variants enabled.  Very large (about 250 MB).
   boostFull = appendToName "full" (boost.override {

From 385f242a400749b3923d51fff5a86403e6dab0dc Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 25 Feb 2012 19:36:24 +0000
Subject: [PATCH 037/109] node.js: Get building on darwin

svn path=/nixpkgs/trunk/; revision=32563
---
 pkgs/development/web/nodejs/default.nix       | 12 ++++++++---
 .../development/web/nodejs/no-arch-flag.patch | 21 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/web/nodejs/no-arch-flag.patch

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 9f48627e392..19785753b2d 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8 }:
+{ stdenv, fetchurl, openssl, python, zlib, v8, darwinInstallNameToolUtility }:
 
 stdenv.mkDerivation rec {
   version = "0.6.10";
@@ -17,11 +17,17 @@ stdenv.mkDerivation rec {
     "--shared-v8-libpath=${v8}/lib"
   ];
 
-  patchPhase = ''
+  patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
+
+  prePatch = ''
     sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf}
   '';
 
-  buildInputs = [ python openssl v8 zlib];
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
+  '';
+
+  buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isDarwin darwinInstallNameToolUtility;
 
   meta = with stdenv.lib; {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
diff --git a/pkgs/development/web/nodejs/no-arch-flag.patch b/pkgs/development/web/nodejs/no-arch-flag.patch
new file mode 100644
index 00000000000..bbe96c0c552
--- /dev/null
+++ b/pkgs/development/web/nodejs/no-arch-flag.patch
@@ -0,0 +1,21 @@
+diff -Naur node-v0.6.10-orig/wscript node-v0.6.10/wscript
+--- node-v0.6.10-orig/wscript	2012-02-02 19:56:42.000000000 -0500
++++ node-v0.6.10/wscript	2012-02-25 14:18:50.000000000 -0500
+@@ -443,17 +443,6 @@
+   if sys.platform.startswith("darwin"):
+     # used by platform_darwin_*.cc
+     conf.env.append_value('LINKFLAGS', ['-framework','Carbon'])
+-    # cross compile for architecture specified by DEST_CPU
+-    if 'DEST_CPU' in conf.env:
+-      arch = conf.env['DEST_CPU']
+-      # map supported_archs to GCC names:
+-      arch_mappings = {'ia32': 'i386', 'x64': 'x86_64'}
+-      if arch in arch_mappings:
+-        arch = arch_mappings[arch]
+-      flags = ['-arch', arch]
+-      conf.env.append_value('CCFLAGS', flags)
+-      conf.env.append_value('CXXFLAGS', flags)
+-      conf.env.append_value('LINKFLAGS', flags)
+   if 'DEST_CPU' in conf.env:
+     arch = conf.env['DEST_CPU']
+     # TODO: -m32 is only available on 64 bit machines, so check host type

From b4bee8caf5a282cae972c5b25eea05b00fb31253 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 25 Feb 2012 20:18:00 +0000
Subject: [PATCH 038/109] nixUnstable: Run checkPhase after installPhase to
 work around a test suite bug

svn path=/nixpkgs/trunk/; revision=32567
---
 pkgs/tools/package-management/nix/unstable.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 175ae069382..7ad69e8353a 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -4,7 +4,7 @@
 , stateDir ? "/nix/var"
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "nix-1.0pre31851";
 
   src = fetchurl {
@@ -51,4 +51,6 @@ stdenv.mkDerivation rec {
     homepage = http://nixos.org/;
     license = "LGPLv2+";
   };
-}
+} // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      phases = "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases";
+})

From e4ff365eb44fcbf6363c835247103a38a0818768 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Feb 2012 20:26:25 +0000
Subject: [PATCH 039/109] * EC2 AMI tools updated to 1.4.0.5.

svn path=/nixpkgs/trunk/; revision=32568
---
 .../amazon-ec2-ami-tools/default.nix          |  4 +-
 .../amazon-ec2-ami-tools/writable.patch       | 56 ++++++++-----------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
index f6f32a7c5b7..36dc77bcd2d 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "ec2-ami-tools-1.4.0.1";
+  name = "ec2-ami-tools-1.4.0.5";
   
   buildInputs = [ unzip makeWrapper ];
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
-    sha256 = "1fjg3gx5k0z8r4apg5whz3yxc3xnz7z5g6j93hf765lfriz1rccz";
+    sha256 = "0vhdqmi076ipqj05dd7fn0drbhcvzccdcdhy8br9sp684scg9a75";
   };
 
   # Amazon EC2 requires that disk images are writable.  If they're
diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch
index c8d0597b479..54c2228911e 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch
+++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch
@@ -1,33 +1,23 @@
-diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb
-*** ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb	2009-12-02 22:28:44.000000000 +0100
---- ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb	2010-01-22 16:16:13.000000000 +0100
-***************
-*** 80,86 ****
-        # piped via several processes. The tee is used to allow a
-        # digest of the file to be calculated without having to re-read
-        # it from disk.
-!       tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse
-        tar.add(File::basename( image_file ), File::dirname( image_file ))
-        openssl = EC2::Platform::Current::Constants::Utility::OPENSSL
-        pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug)
---- 80,86 ----
-        # piped via several processes. The tee is used to allow a
-        # digest of the file to be calculated without having to re-read
-        # it from disk.
-!       tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable
-        tar.add(File::basename( image_file ), File::dirname( image_file ))
-        openssl = EC2::Platform::Current::Constants::Utility::OPENSSL
-        pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug)
-diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb
-*** ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb	2009-12-02 22:28:44.000000000 +0100
---- ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb	2010-01-22 16:16:11.000000000 +0100
-***************
-*** 31,36 ****
---- 31,37 ----
-            def update;         @options << '-u';          self; end
-            def sparse;         @options << '-S';          self; end
-            def dereference;    @options << '-h';          self; end
-+           def writable;       @options << '--mode=0755'; self; end
-            
-            def archive(filename)
-              filename = '-' if filename.nil? 
+diff -ru ec2-ami-tools-1.4.0.5-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.4.0.5/lib/ec2/amitools/bundle.rb
+--- ec2-ami-tools-1.4.0.5-orig/lib/ec2/amitools/bundle.rb	2011-12-06 14:57:28.000000000 +0100
++++ ec2-ami-tools-1.4.0.5/lib/ec2/amitools/bundle.rb	2012-02-25 21:24:57.682427268 +0100
+@@ -80,7 +80,7 @@
+       # piped via several processes. The tee is used to allow a
+       # digest of the file to be calculated without having to re-read
+       # it from disk.
+-      tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse
++      tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable
+       tar.owner(0).group(0)
+       tar.add(File::basename( image_file ), File::dirname( image_file ))
+       openssl = EC2::Platform::Current::Constants::Utility::OPENSSL
+diff -ru ec2-ami-tools-1.4.0.5-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.4.0.5/lib/ec2/platform/linux/tar.rb
+--- ec2-ami-tools-1.4.0.5-orig/lib/ec2/platform/linux/tar.rb	2011-12-06 14:57:28.000000000 +0100
++++ ec2-ami-tools-1.4.0.5/lib/ec2/platform/linux/tar.rb	2012-02-25 21:23:36.342716403 +0100
+@@ -31,6 +31,7 @@
+           def update;         @options << '-u';          self; end
+           def sparse;         @options << '-S';          self; end
+           def dereference;    @options << '-h';          self; end
++          def writable;       @options << '--mode=0755'; self; end
+           
+           def archive(filename)
+             filename = '-' if filename.nil? 

From 91e3d54b8f62249ff54e288f15354d669aed537d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Feb 2012 11:07:56 +0000
Subject: [PATCH 040/109] * Remove the ruby/default.nix, it's not very useful.

svn path=/nixpkgs/trunk/; revision=32572
---
 pkgs/development/interpreters/ruby/default.nix | 1 -
 pkgs/top-level/all-packages.nix                | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 pkgs/development/interpreters/ruby/default.nix

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
deleted file mode 100644
index 550edcc004a..00000000000
--- a/pkgs/development/interpreters/ruby/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-import ./ruby-19.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf6af1326a7..50417a72ace 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2766,7 +2766,8 @@ let
 
   ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
   ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
-  ruby = callPackage ../development/interpreters/ruby { };
+  
+  ruby = ruby19;
 
   rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
 

From a488f53a54051910d84724ad99f4c69e19a3cf78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Feb 2012 11:10:00 +0000
Subject: [PATCH 041/109] * Many buildr Buildfiles rely on RUBYLIB containing
 the current directory   (as was the default in Ruby < 1.9.2).  So make sure
 that's the case   when running buildr.

svn path=/nixpkgs/trunk/; revision=32573
---
 pkgs/development/interpreters/ruby/gem.nix     | 3 ++-
 pkgs/development/interpreters/ruby/patches.nix | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix
index a64f10e268c..8ec80b785de 100644
--- a/pkgs/development/interpreters/ruby/gem.nix
+++ b/pkgs/development/interpreters/ruby/gem.nix
@@ -31,7 +31,8 @@ let
         wrapProgram "$prog" \
           --prefix GEM_PATH : "$GEM_PATH" \
           --prefix RUBYLIB : "${rubygems}/lib" \
-          --set RUBYOPT 'rubygems'
+          --set RUBYOPT rubygems \
+          $extraWrapperFlags ''${extraWrapperFlagsArray[@]}
       done
 
       for prog in $out/gems/*/bin/*; do
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index 37f103f7772..a2d2d753a4a 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -61,4 +61,11 @@ in
     buildInputs = [ jdk ];
     JAVA_HOME = jdk;
   };
+
+  buildr = {
+    # Many Buildfiles rely on RUBYLIB containing the current directory
+    # (as was the default in Ruby < 1.9.2).
+    extraWrapperFlags = "--prefix RUBYLIB : .";
+  };
+  
 }

From 91b809a1ecd3218a4b3335f9275d261cc96bd8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 11:55:41 +0000
Subject: [PATCH 042/109] Updating the nvidia drivers for legacy 173

svn path=/nixpkgs/trunk/; revision=32575
---
 pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
index 638f2e4360e..541e442f6b1 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
@@ -2,7 +2,7 @@
 
 let 
 
-  versionNumber = "173.14.27";
+  versionNumber = "173.14.31";
 
 in
 
@@ -15,12 +15,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
-        sha256 = "08l3zs7sb8n4vjm1vg3yy1pkj54dq7gfrjashlqwbznaa2cdwknb";
+        sha256 = "090rkl1psmcsx3mxb6lnirqipka8vp78y2j7pzqyzl592qpscmg8";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run";
-        sha256 = "0pmg5whpk0rmzg8zb7qq2imva2hf346c4pvpz5sjir6346350blw";
+        sha256 = "0hs4fd61iha7b2936wj5w5fj3rxmw60jnkgf6l1pl3va7sfw30d2";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From c79294e4952c4b3d3b0316ddbf0133137eae6284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 16:21:12 +0000
Subject: [PATCH 043/109] Updating task coach to 1.3.8.

svn path=/nixpkgs/trunk/; revision=32577
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 35de47cc5e5..488fce66feb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1918,11 +1918,11 @@ let pythonPackages = python.modules // rec {
   };
 
   taskcoach = buildPythonPackage rec {
-    name = "TaskCoach-1.3.7";
+    name = "TaskCoach-1.3.8";
 
     src = fetchurl {
       url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
-      sha256 = "069hyxc8ypn51a8imfkfqdalp1l4pv09swj2v3bi4hjscq9af6i8";
+      sha256 = "0gc277cgnw6f167lrbxlf7rmgyjxwzgkmi77qz9xwvnwcj2l94xn";
     };
 
     propagatedBuildInputs = [ wxPython ];

From cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 20:06:01 +0000
Subject: [PATCH 044/109] Adding the latest zlib, otherwise vlc does not build.

This also could be used for a newer cmake, or some trouble there was with libxml2.


svn path=/nixpkgs/trunk/; revision=32598
---
 pkgs/development/libraries/zlib/latest.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix            |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/zlib/latest.nix

diff --git a/pkgs/development/libraries/zlib/latest.nix b/pkgs/development/libraries/zlib/latest.nix
new file mode 100644
index 00000000000..1333c9fdfdf
--- /dev/null
+++ b/pkgs/development/libraries/zlib/latest.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl}:
+
+# To be removed in stdenv-updates, as default.nix is already right there.
+stdenv.mkDerivation rec {
+  name = "zlib-1.2.6";
+  
+  src = fetchurl {
+    url = "http://www.zlib.net/${name}.tar.gz";
+    sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50417a72ace..d429751bffb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4845,6 +4845,9 @@ let
     fetchurl = fetchurlBoot;
   };
 
+  # To be removed in stdenv-updates; zlib is already fixed and the latest there
+  zlib_latest = callPackage ../development/libraries/zlib/latest.nix { };
+
   zlibStatic = lowPrio (appendToName "static" (import ../development/libraries/zlib {
     inherit fetchurl stdenv;
     static = true;
@@ -7633,7 +7636,11 @@ let
     inherit (xlibs) libX11;
   };
 
-  vlc = callPackage ../applications/video/vlc { };
+  vlc = callPackage ../applications/video/vlc {
+    # To be removed on stdenv-updates. It fails on i686-linux with
+    # the stdenv zlib.
+    zlib = zlib_latest;
+  };
 
   vnstat = callPackage ../applications/networking/vnstat { };
 

From a9b800c8af3512b6c1b269927b719c0ddbd6f296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 20:47:12 +0000
Subject: [PATCH 045/109] Updating blender to 2.67. Maybe this will build in
 stdenv-updates too.

I remove the blender 2.49; I think I don't need it anymore.


svn path=/nixpkgs/trunk/; revision=32599
---
 pkgs/applications/misc/blender/2.49.nix    | 33 ----------------------
 pkgs/applications/misc/blender/default.nix | 20 ++++++-------
 pkgs/top-level/all-packages.nix            |  9 ++----
 3 files changed, 12 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/applications/misc/blender/2.49.nix

diff --git a/pkgs/applications/misc/blender/2.49.nix b/pkgs/applications/misc/blender/2.49.nix
deleted file mode 100644
index 6a66c45b94f..00000000000
--- a/pkgs/applications/misc/blender/2.49.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL
-, openexr, libsamplerate, libXi, libtiff, ilmbase, freetype}:
-
-stdenv.mkDerivation rec {
-  name = "blender-2.49b";
-
-  src = fetchurl {
-    url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "1214fp2asij7l1sci2swh46nfjgpm72gk2qafq70xc0hmas4sm93";
-  };
-
-  buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate
-    libXi libtiff ilmbase freetype ];
-
-  cmakeFlags = [ "-DFREETYPE_INC=${freetype}/include" "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF"
-    "-DPYTHON_LIBPATH=${python}/lib" ];
-
-  NIX_LDFLAGS = "-lX11";
-  NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2";
-
-  installPhase = ''
-    ensureDir $out/bin
-    cp bin/* $out/bin
-  '';
-
-  meta = { 
-    description = "3D Creation/Animation/Publishing System";
-    homepage = http://www.blender.org;
-    # They comment two licenses: GPLv2 and Blender License, but they
-    # say: "The BL has not been activated yet."
-    license = "GPLv2+";
-  };
-}
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 75d737e5996..c291192ef01 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchurl, SDL, cmake, gettext, ilmbase, libXi, libjpeg,
 libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg,
-python, zlib }:
+python, zlib, boost }:
 
 stdenv.mkDerivation rec {
-  name = "blender-2.57";
+  name = "blender-2.62";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "1f4l0zkfmbd8ydzwvmb5jw89y7ywd9k8m2f1b3hrdpgjcqhq3lcb";
+    sha256 = "19xfr5vx66p4p3hnqpglpky6f4bh3ay484mdgh7zg6j9f80dp53q";
   };
 
   buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal
-    SDL openexr libsamplerate libXi libtiff ilmbase openjpeg ];
+    SDL openexr libsamplerate libXi libtiff ilmbase openjpeg boost ];
 
-  patchPhase = ''
-      sed -e "s@/usr/local@${python}@" -i build_files/cmake/FindPythonLibsUnix.cmake
-  '';
-
-  cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
-    "-DWITH_OPENCOLLADA=OFF" "-DWITH_INSTALL_PORTABLE=OFF"];
+  cmakeFlags = [
+    "-DOPENEXR_INC=${openexr}/include/OpenEXR"
+    "-DWITH_OPENCOLLADA=OFF"
+    "-DWITH_INSTALL_PORTABLE=OFF"
+    "-DPYTHON_LIBPATH=${python}/lib"
+  ];
 
   NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d429751bffb..e87454999b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6449,14 +6449,9 @@ let
     gnutls = gnutls2;
   };
 
-  blender = callPackage ../applications/misc/blender/2.49.nix { };
-
-  blender_2_57 = lowPrio (import ../applications/misc/blender {
-    inherit stdenv fetchurl SDL cmake gettext ilmbase libjpeg libpng
-      libsamplerate libtiff mesa openal openexr openjpeg zlib;
-    inherit (xlibs) libXi;
+  blender = callPackage  ../applications/misc/blender {
     python = python32;
-  });
+  };
 
   bvi = callPackage ../applications/editors/bvi { };
 

From 3d028687e9ea7dcac4806de1b83d520c77b93423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 20:56:20 +0000
Subject: [PATCH 046/109] I update krb5, so it may also build on
 stdenv-updates.

svn path=/nixpkgs/trunk/; revision=32600
---
 pkgs/development/libraries/kerberos/krb5.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index ae8165638d1..38272165a28 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "krb5";
-  version = "1.6.3";
+  version = "1.10";
   name = "${pname}-${version}";
   webpage = http://web.mit.edu/kerberos/;
 in
@@ -11,8 +11,8 @@ stdenv.mkDerivation (rec {
   inherit name;
 
   src = fetchurl {
-    url = "${webpage}/dist/krb5/1.6/${name}-signed.tar";
-    sha256 = "7a1bd7d4bd326828c8ee382ed2b69ccd6c58762601df897d6a32169d84583d2a";
+    url = "${webpage}/dist/krb5/1.10/${name}-signed.tar";
+    sha256 = "1pa4m6538drb51gsqxbbxlsnc9fm9ccid9m2s3pv3di5l0a7l8bg";
   };
 
   buildInputs = [ perl ncurses yacc ];

From f00e2914e3025ec80988e486cf0522086ea536f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 21:06:55 +0000
Subject: [PATCH 047/109] Removing grub 1.98. It was useful only when we only
 had 1.99rc1 to boot from raid md devices. In 1.99, all worked.

svn path=/nixpkgs/trunk/; revision=32602
---
 pkgs/tools/misc/grub/1.98.nix   | 79 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 -
 2 files changed, 81 deletions(-)
 delete mode 100644 pkgs/tools/misc/grub/1.98.nix

diff --git a/pkgs/tools/misc/grub/1.98.nix b/pkgs/tools/misc/grub/1.98.nix
deleted file mode 100644
index df7d3408b61..00000000000
--- a/pkgs/tools/misc/grub/1.98.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }:
-
-let unifont_bdf = fetchurl {
-      url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
-      sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
-    };
-in
-
-stdenv.mkDerivation rec {
-  name = "grub-1.98";
-
-  src = fetchurl {
-    url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";
-    sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy";
-  };
-
-  buildInputs = [ bison ncurses libusb freetype gettext ]
-    ++ stdenv.lib.optional doCheck qemu;
-
-  preConfigure =
-    '' for i in "tests/util/"*.in
-       do
-         sed -i "$i" -e's|/bin/bash|/bin/sh|g'
-       done
-
-       # Apparently, the QEMU executable is no longer called
-       # `qemu-system-i386', even on i386.
-       #
-       # In addition, use `-nodefaults' to avoid errors like:
-       #
-       #  chardev: opening backend "stdio" failed
-       #  qemu: could not open serial device 'stdio': Invalid argument
-       #
-       # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
-       sed -i "tests/util/grub-shell.in" \
-           -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
-    '';
-
-  patches =
-    [ # The udev rules for LVM create symlinks in /dev/mapper rathe
-      # than device nodes, causing GRUB to fail to recognize LVM
-      # volumes. See
-      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704
-      # This ugly workaround makes `find_root_device' use stat() on
-      # files in /dev/mapper instead of lstat().
-      ./device-mapper-symlinks.patch
-    ];
-
-  postPatch =
-    '' gunzip < "${unifont_bdf}" > "unifont.bdf"
-       sed -i "configure" \
-           -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
-    '';
-
-  doCheck = true;
-
-  meta = {
-    description = "GNU GRUB, the Grand Unified Boot Loader (2.x alpha)";
-
-    longDescription =
-      '' GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand
-         Unified Bootloader, which was originally designed and implemented by
-         Erich Stefan Boleyn.
-
-         Briefly, the boot loader is the first software program that runs when a
-         computer starts.  It is responsible for loading and transferring
-         control to the operating system kernel software (such as the Hurd or
-         the Linux).  The kernel, in turn, initializes the rest of the
-         operating system (e.g., GNU).
-      '';
-
-    homepage = http://www.gnu.org/software/grub/;
-
-    license = "GPLv3+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e87454999b7..54e0b73d4a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -804,8 +804,6 @@ let
 
   grub19x = callPackage ../tools/misc/grub/1.9x.nix { };
 
-  grub198 = callPackage ../tools/misc/grub/1.98.nix { };
-
   grub2 = grub19x;
 
   grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; };

From 7a5a0c24df24bd43c02ecd0e98a3e77809d3d706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 26 Feb 2012 21:23:59 +0000
Subject: [PATCH 048/109] Updating itk to 4.0.0, so they may also build in
 stdenv-updates.

svn path=/nixpkgs/trunk/; revision=32603
---
 pkgs/development/libraries/itk/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index c0088d7a8d6..6be998b691a 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -1,18 +1,19 @@
-{stdenv, fetchurl, cmake, libX11, libuuid}:
+{stdenv, fetchurl, cmake, libX11, libuuid, xz}:
 
 stdenv.mkDerivation rec {
-  name = "itk-3.16.0";
+  name = "itk-4.0.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/itk/InsightToolkit-3.16.0.tar.gz;
-    sha256 = "18r021ib2g94qlajjsny0r6cpc61rmr0zrpb2l0mx1y7j9ckr6ks";
+    url = mirror://sourceforge/itk/InsightToolkit-4.0.0.tar.xz;
+    sha256 = "05z49sw612cbyiaghcsda0xylrkf06jh81ql79si5632w1hpgbd9";
   };
 
   cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" ];
 
-  # makeFlags = [ "VERBOSE=1" ];
+  enableParallelBuilding = true;
 
-  buildInputs = [ cmake libX11 libuuid ];
+  buildNativeInputs = [ cmake xz ];
+  buildInputs = [ libX11 libuuid ];
 
   meta = {
     description = "Insight Segmentation and Registration Toolkit";

From ae5fefca48ad6b55a4ec9b3e2b94cc5485a8553a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 26 Feb 2012 22:47:28 +0000
Subject: [PATCH 049/109] audacious: updated to version 3.2.1

svn path=/nixpkgs/trunk/; revision=32609
---
 pkgs/applications/audio/audacious/default.nix | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 5124ff5d6dd..edec7dcb41d 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -3,22 +3,25 @@
 , libvorbis, libcdio, libcddb, flac, ffmpeg
 }:
 
-stdenv.mkDerivation rec {
-  name = "audacious-3.0";
-  
+let
+  version = "3.2.1";
+in
+stdenv.mkDerivation {
+  name = "audacious-${version}";
+
   src = fetchurl {
-    url = "http://distfiles.atheme.org/${name}.tar.gz";
-    sha256 = "0kj78hgf73fmbm6y3idir2kavbnnlv0jb9ka0pcsb12sxb994s68";
+    url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
+    sha256 = "064a8d2887a0f92a1637df9d71b8eefa8064199c04eccfaac725f840cff6eac3";
   };
 
   pluginsSrc = fetchurl {
-    url = "http://distfiles.atheme.org/audacious-plugins-3.0.tar.gz";
-    sha256 = "0hhxk1mxnnrb1shshpf1nf8mqpc9q1qpsljwn4jzylcnwy6pq4rw";
+    url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
+    sha256 = "5b7d3e52f6b8903bc01ae15651817e990d3348ae6b9734767f354eb2dbfc8c2d";
   };
-  
+
   # `--enable-amidiplug' is to prevent configure from looking in /proc/asound.
   configureFlags = "--enable-amidiplug --disable-oss";
-  
+
   buildInputs =
     [ gettext pkgconfig glib gtk libmowgli libmcs libxml2 dbus_glib
       libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio
@@ -51,6 +54,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Audacious, a media player forked from the Beep Media Player, which was itself an XMMS fork";
     homepage = http://audacious-media-player.org/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
   };
 }

From 4ff245c5dee25800ab9dbdcba2e9bc540724edc2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 27 Feb 2012 06:22:47 +0000
Subject: [PATCH 050/109] Add fresh cmake

svn path=/nixpkgs/trunk/; revision=32611
---
 .../tools/build-managers/cmake/2.8.7.nix      | 61 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/cmake/2.8.7.nix

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.7.nix b/pkgs/development/tools/build-managers/cmake/2.8.7.nix
new file mode 100644
index 00000000000..c440285671b
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/2.8.7.nix
@@ -0,0 +1,61 @@
+{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
+, useNcurses ? false, ncurses, useQt4 ? false, qt4
+, darwinInstallNameToolUtility }:
+
+with stdenv.lib;
+
+let
+  os = stdenv.lib.optionalString;
+  majorVersion = "2.8";
+  minorVersion = "7";
+  version = "${majorVersion}.${minorVersion}";
+in
+
+# WARNING: Do NOT upgrade cmake in trunk: it fails to build on i686-linux
+stdenv.mkDerivation rec {
+  name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
+
+  inherit majorVersion;
+
+  src = fetchurl {
+    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
+    sha256 = "130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f";
+  };
+
+  patches =
+    # Don't search in non-Nix locations such as /usr, but do search in
+    # Nixpkgs' Glibc.
+    optional (stdenv ? glibc) ./search-path.patch;
+
+  buildInputs = [ curl expat zlib bzip2 libarchive ]
+    ++ optional stdenv.isDarwin darwinInstallNameToolUtility
+    ++ optional useNcurses ncurses
+    ++ optional useQt4 qt4;
+
+  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
+  
+  configureFlags =
+    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
+    + stdenv.lib.optionalString useQt4 " --qt-gui";
+
+  setupHook = ./setup-hook.sh;
+
+  postUnpack =
+    ''
+      dontUseCmakeConfigure=1
+      source $setupHook
+      fixCmakeFiles $sourceRoot
+    '';
+
+  preConfigure = optionalString (stdenv ? glibc)
+    ''
+      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
+    '';
+
+  meta = {
+    homepage = http://www.cmake.org/;
+    description = "Cross-Platform Makefile Generator";
+    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54e0b73d4a1..9814f181579 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2958,6 +2958,10 @@ let
   };
 
   cmake = callPackage ../development/tools/build-managers/cmake { };
+  
+  cmake_2_8_7 = callPackage ../development/tools/build-managers/cmake/2.8.7.nix { 
+    zlib = zlib_latest;
+  };
 
   cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { };
 

From 3a4916369e1bae461311689a6b2932a3b9dad943 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 27 Feb 2012 07:00:01 +0000
Subject: [PATCH 051/109] Fix LyX dependencies

svn path=/nixpkgs/trunk/; revision=32612
---
 pkgs/applications/misc/lyx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index faddeb70e99..9d48008af36 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -1,5 +1,5 @@
 # I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
-{ fetchurl, stdenv, texLive, python, makeWrapper
+{ fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig
 , libX11, qt, xz
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61";
   };
 
-  buildInputs = [texLive qt python makeWrapper xz ];
+  buildInputs = [texLive qt python makeWrapper xz pkgconfig ];
 
   # don't ask me why it can't find libX11.so.6
   postInstall = ''

From e6fa414b6426ee9fe610f79c51bd28c80bd5e569 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 27 Feb 2012 07:10:05 +0000
Subject: [PATCH 052/109] Update and fix Tulip

svn path=/nixpkgs/trunk/; revision=32613
---
 pkgs/applications/science/misc/tulip/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index c3e39145dd8..52b93c8e174 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -1,16 +1,16 @@
 { fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4
-, cmake, makeWrapper }:
+, cmake, makeWrapper, libjpeg }:
 
-let version = "3.6.1"; in
+let version = "3.7.0"; in
 stdenv.mkDerivation rec {
   name = "tulip-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/auber/${name}-src.tar.gz";
-    sha256 = "0d76zmp7gmid4lc91zz6sp4rzxlga6vfwfqhap04326r4zl4nx1q";
+    url = "mirror://sourceforge/auber/tulip/tulip-3.7.0/${name}-src.tar.gz";
+    sha256 = "150fj9pdxblvl5sby61cb2kq98r6h8yljk3vq5xizn198d3fz4jq";
   };
 
-  buildInputs = [ libxml2 freetype glew mesa qt4 ];
+  buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ];
 
   buildNativeInputs = [ cmake makeWrapper ];
 

From 617614d220086e2aba6d96633ec2bd7cefd463c0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Feb 2012 10:11:56 +0000
Subject: [PATCH 053/109] haskell-mathblog: updated to version 0.5

svn path=/nixpkgs/trunk/; revision=32615
---
 ...cies-on-SHA-HUnit-and-test-framework.patch | 41 -------------------
 pkgs/applications/misc/mathblog/default.nix   |  7 +---
 2 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch

diff --git a/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch b/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
deleted file mode 100644
index bf524dc957d..00000000000
--- a/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0fbc8097f98481439e68aeb095a8d7e106924bbe Mon Sep 17 00:00:00 2001
-From: Jonathan Daugherty <jtd@galois.com>
-Date: Tue, 21 Feb 2012 11:06:57 -0800
-Subject: [PATCH 6/8] Loosen dependencies on SHA, HUnit, and test-framework
-
----
- mathblog.cabal |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mathblog.cabal b/mathblog.cabal
-index ea5498c..371dd12 100644
---- a/mathblog.cabal
-+++ b/mathblog.cabal
-@@ -44,7 +44,7 @@ Executable mb
-     process >= 1.0,
-     time >= 1.1,
-     old-locale >= 1.0,
--    SHA >= 1.4 && < 1.5,
-+    SHA >= 1.4 && < 1.6,
-     bytestring >= 0.9 && < 1.0,
-     HStringTemplate >= 0.6 && < 0.7,
-     ConfigFile >= 1.1 && < 1.2
-@@ -79,12 +79,12 @@ Executable mb-tests
-     process >= 1.0 && < 1.1,
-     time >= 1.1,
-     old-locale >= 1.0 && < 1.1,
--    SHA >= 1.4 && < 1.5,
-+    SHA >= 1.4 && < 1.6,
-     bytestring >= 0.9 && < 1.0,
-     HStringTemplate >= 0.6 && < 0.7,
-     ConfigFile >= 1.1 && < 1.2,
--    HUnit >= 1.2.2 && < 1.2.3,
--    test-framework >= 0.3.3 && < 0.4,
-+    HUnit >= 1.2.2 && < 1.2.5,
-+    test-framework >= 0.3.3 && < 0.6,
-     test-framework-hunit >= 0.2.6 && < 0.3
- 
-   GHC-Options: -Wall
--- 
-1.7.8
-
diff --git a/pkgs/applications/misc/mathblog/default.nix b/pkgs/applications/misc/mathblog/default.nix
index fa9dec04960..2944df496f2 100644
--- a/pkgs/applications/misc/mathblog/default.nix
+++ b/pkgs/applications/misc/mathblog/default.nix
@@ -4,17 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "mathblog";
-  version = "0.4";
-  sha256 = "0kpawik74hp9k56b858idnlkla3iaalys8mas6c4gf4jfw2w0r3j";
+  version = "0.5";
+  sha256 = "01iyzrwscqirhcr4622d0n16mr4p54qbvg5m2a0ns36j59xfd79g";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA
     testFramework testFrameworkHunit time
   ];
-  patches = [
-    ./0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
-  ];
   meta = {
     description = "A program for creating and managing a static weblog with LaTeX math and function graphs";
     license = self.stdenv.lib.licenses.bsd3;

From 4c93fa4e479d5d301dd8fb234b3fca432eceaca5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Feb 2012 10:12:03 +0000
Subject: [PATCH 054/109] haskell-persistent: updated to version 0.8.0.1

svn path=/nixpkgs/trunk/; revision=32616
---
 pkgs/development/libraries/haskell/persistent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 51fdacfcf2b..d498aa6edd0 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.8.0";
-  sha256 = "0z70ibicfbfripp1x9csfvfhn7k26j78jvvig9ylsjwldhysr7qr";
+  version = "0.8.0.1";
+  sha256 = "1lsmsx0zxa3h83z29r6h3r94czg7c8apid9mah48f8hxlfynbqhi";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
     monadControl mtl pathPieces poolConduit text time transformers

From 47fcc7c093cd33a128182da46b8ac8ba8fc7194e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Feb 2012 10:12:06 +0000
Subject: [PATCH 055/109] pkgs/top-level/all-packages.nix: stripped extraneous
 whitespace

svn path=/nixpkgs/trunk/; revision=32617
---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9814f181579..911279a90b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2764,7 +2764,7 @@ let
 
   ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
   ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
-  
+
   ruby = ruby19;
 
   rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
@@ -2958,8 +2958,8 @@ let
   };
 
   cmake = callPackage ../development/tools/build-managers/cmake { };
-  
-  cmake_2_8_7 = callPackage ../development/tools/build-managers/cmake/2.8.7.nix { 
+
+  cmake_2_8_7 = callPackage ../development/tools/build-managers/cmake/2.8.7.nix {
     zlib = zlib_latest;
   };
 

From 9da23d5840e15bc6967974ca0cd91d974cbacea0 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Mon, 27 Feb 2012 10:55:52 +0000
Subject: [PATCH 056/109] NVidia proprietary driver: version bump

svn path=/nixpkgs/trunk/; revision=32618
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 5b829db09cd..23d1062cc39 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "290.10"; in
+let versionNumber = "295.20"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1amdqmgi8rf8mafc5d8jnw6rk1bxrmxc5jm4wm2p8xqzm99qzglr";
+        sha256 = "006my8y7dkmzy1y3md1j2p9sy53cvhz7idkjgzizyg05jgac778g";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "01d4cci1ipnamrxisdvsxjr6d4qbj257b46y0glm6grnw11i3x2g";
+        sha256 = "1m69ki94szy7inqc5x2znab9jjqjfyjd4lwvx9qnazq918gdf1kx";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 49cb0810190cd6cee291d414f25558726f964390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 27 Feb 2012 16:45:35 +0000
Subject: [PATCH 057/109] Updating doxygen to 1.8.0

svn path=/nixpkgs/trunk/; revision=32619
---
 pkgs/development/tools/documentation/doxygen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 86f2e8cf2b2..776c0bf450c 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl, flex, bison, qt4 }:
 
 let
-  name = "doxygen-1.7.4";
+  name = "doxygen-1.8.0";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
-    sha256 = "0rnzyp5f8c454fdkgpg5hpxwmx642spgxcpw3blbvnyw8129jp44";
+    sha256 = "0cymkk8wpws326aqpsixyzr4pk98xgpzrvxxjm76ar79pcs91ykh";
   };
 
   patches = [ ./tmake.patch ];

From 0400423fb17a9d7a2bfcbe409fa48924f07ac43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Feb 2012 17:22:27 +0000
Subject: [PATCH 058/109] GCC 4.6: Fix erroneous dependency on X libraries when
 !javaAwtGtk.

svn path=/nixpkgs/trunk/; revision=32620
---
 pkgs/development/compilers/gcc-4.6/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc-4.6/default.nix b/pkgs/development/compilers/gcc-4.6/default.nix
index 4a368977633..7160f530a09 100644
--- a/pkgs/development/compilers/gcc-4.6/default.nix
+++ b/pkgs/development/compilers/gcc-4.6/default.nix
@@ -223,7 +223,7 @@ stdenv.mkDerivation ({
     ++ (optional (cloog != null) cloog)
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
-    ++ (optionals javaAwtGtk [ gtk libart_lgpl ] ++ xlibs)
+    ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])

From 27916e6f083e67e4d43986584f5ed41a7d16b54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Feb 2012 17:22:30 +0000
Subject: [PATCH 059/109] GCC 4.6: Fix the Canadian cross.

svn path=/nixpkgs/trunk/; revision=32621
---
 pkgs/top-level/all-packages.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 911279a90b8..802904b1903 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1922,9 +1922,6 @@ let
 
   gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
     inherit noSysDirs;
-    cross = null;
-    libcCross = null;
-    binutilsCross = null;
 
     ppl = ppl0_11;
     cloogppl = null;
@@ -1932,6 +1929,16 @@ let
     # bootstrapping a profiled compiler does not work in the sheevaplug:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
     profiledCompiler = if stdenv.system == "armv5tel-linux" then false else true;
+
+    # When building `gcc.hostDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+    libpthreadCross =
+      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+      then gnu.libpthreadCross
+      else null;
   }));
 
   # A non-stripped version of GCC.

From 2d7b05d332732740284e4ce5d8f25875bcdbc417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Feb 2012 17:50:44 +0000
Subject: [PATCH 060/109] release-cross: Build `gnu.smbfs.hostDrv', not
 `gnu.smbfs'.

svn path=/nixpkgs/trunk/; revision=32628
---
 pkgs/top-level/release-cross.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 71e4944b303..e6a4798f27b 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -182,7 +182,7 @@ in {
     gnu.hurdCross = nativePlatforms;
     gnu.mach.hostDrv = nativePlatforms;
     gnu.mig = nativePlatforms;
-    gnu.smbfs = nativePlatforms;
+    gnu.smbfs.hostDrv = nativePlatforms;
 
     coreutils.hostDrv = nativePlatforms;
     ed.hostDrv = nativePlatforms;

From 9a42b0b52b37c7771bbfa2a3aa197bb10cd9ec2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Feb 2012 18:28:29 +0000
Subject: [PATCH 061/109] GNU libc: Update the Hurd port.

svn path=/nixpkgs/trunk/; revision=32630
---
 .../libraries/glibc-2.12/common.nix           |  9 ++++-----
 .../glibc-2.12/hurd-sigstate-functions.patch  | 20 -------------------
 2 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch

diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index 8f0c092d35c..6a68077ab34 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -12,7 +12,7 @@ cross :
 
 let
   # For GNU/Hurd, see below.
-  version = if hurdHeaders != null then "20120221" else "2.12.2";
+  version = if hurdHeaders != null then "20120223" else "2.12.2";
 
   needsPortsNative = stdenv.isMips || stdenv.isArm;
   needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@@ -75,8 +75,7 @@ stdenv.mkDerivation ({
 
     /* Allow nixos and nix handle the locale-archive. */
     ./nix-locale-archive.patch
-  ]
-  ++ (stdenv.lib.optional (hurdHeaders != null) ./hurd-sigstate-functions.patch);
+  ];
 
   postPatch = ''
     # Needed for glibc to build with the gnumake 3.82
@@ -144,8 +143,8 @@ stdenv.mkDerivation ({
       # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
       # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
       url = "git://git.sv.gnu.org/hurd/glibc.git";
-      sha256 = "fbc053f23167059af414ae1ba9a65931a9d9afaf7d2efb9eba3e258757d12f7d";
-      rev = "b29b3d0ae35be390cab59e4798cbaf9b45fb06e3";
+      sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d";
+      rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1";
     }
     else fetchurl {
       url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch b/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch
deleted file mode 100644
index d46db7b6393..00000000000
--- a/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch adds a GNU ld version script entry for the `_hurd_sigstate_*'
-functions that were introduced to support SA_SIGINFO.  A similar patch
-should be applied upstream soon.
-
-diff --git a/hurd/Versions b/hurd/Versions
-index 83c8ab1..295cfda 100644
---- a/hurd/Versions
-+++ b/hurd/Versions
-@@ -156,6 +156,11 @@ libc {
-     # functions used in macros & inline functions
-     __errno_location;
-   }
-+  GLIBC_2.13 {
-+    # functions introduced for SA_SIGINFO support and referenced from
-+    # <hurd/signal.h>
-+    _hurd_sigstate_*;
-+  }
- 
- %if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
-   HURD_CTHREADS_0.3 {

From 9e371a98c26b9f6745fa97a32ea079c4522daa56 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Feb 2012 20:27:41 +0000
Subject: [PATCH 062/109] haskell-base64-bytestring: downgraded default version
 to 0.1.0.3

Michael Snoyman reports that version 0.1.1.0 has serious performance issues:

> import Data.ByteString.Base64
> import Data.ByteString.Char8 (pack)
> import Criterion.Main
>
> main :: IO ()
> main = defaultMain
>    [ bench "encode" $ whnf encode $ pack "qwerty"
>    ]

On version 0.1.0.3, this takes 229.4312 ns. On 0.1.1.0, it takes 3.556598 ms.
It looks like the problem is coming from the recent addition of URL encoding
(https://github.com/bos/base64-bytestring/commit/f1916d8a86b496cfacd23939b5e3fa10d92abb7b).

svn path=/nixpkgs/trunk/; revision=32632
---
 .../haskell/base64-bytestring/0.1.0.3.nix       | 17 +++++++++++++++++
 .../{default.nix => 0.1.1.0.nix}                |  0
 pkgs/top-level/haskell-packages.nix             |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix
 rename pkgs/development/libraries/haskell/base64-bytestring/{default.nix => 0.1.1.0.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix b/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix
new file mode 100644
index 00000000000..f974a72347f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/base64-bytestring/0.1.0.3.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "base64-bytestring";
+  version = "0.1.0.3";
+  sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3";
+  meta = {
+    homepage = "https://github.com/bos/base64-bytestring";
+    description = "Fast base64 encoding and deconding for ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/base64-bytestring/default.nix
rename to pkgs/development/libraries/haskell/base64-bytestring/0.1.1.0.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 90fd84573b1..534cc3aa2f7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -456,7 +456,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   base64String = callPackage ../development/libraries/haskell/base64-string {};
 
-  base64Bytestring = callPackage ../development/libraries/haskell/base64-bytestring {};
+  base64Bytestring_0_1_0_3 = callPackage ../development/libraries/haskell/base64-bytestring/0.1.0.3.nix {};
+  base64Bytestring_0_1_1_0 = callPackage ../development/libraries/haskell/base64-bytestring/0.1.1.0.nix {};
+  base64Bytestring = self.base64Bytestring_0_1_0_3; # Version 0.1.1.0 has serious performance issues.
 
   baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {};
 

From e3a27acfdbd48d2e3782702f6bad5adadf66d21f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Feb 2012 21:54:33 +0000
Subject: [PATCH 063/109] QEMU-KVM: Use `smbd' from $PATH.

svn path=/nixpkgs/trunk/; revision=32634
---
 pkgs/os-specific/linux/qemu-kvm/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index aa92b2f2d0d..c5c7e0b01f0 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
 
-  configureFlags = "--audio-drv-list=alsa";
+  configureFlags =
+    [ "--audio-drv-list=alsa"
+      "--smbd=smbd"                               # use `smbd' from $PATH
+    ];
 
   enableParallelBuilding = true;
 
@@ -22,12 +25,6 @@ stdenv.mkDerivation rec {
       ncurses python glib
     ];
 
-  preBuild =
-    ''
-      # Don't use a hardcoded path to Samba.
-      substituteInPlace ./net.h --replace /usr/sbin/smbd smbd
-    '';
-
   postInstall =
     ''
       # extboot.bin isn't installed due to a bug in the Makefile.

From 11aceede25573357f562a80fd83ee7875da2f52d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 27 Feb 2012 22:39:23 +0000
Subject: [PATCH 064/109] Downgrading rigsofrods to a version that might work,
 where cars may run fast. This rev should be very close to the stablest 0.38.

I had to bring an old angelscript in.


svn path=/nixpkgs/trunk/; revision=32635
---
 .../interpreters/angelscript/2.20.nix         | 65 +++++++++++++++++++
 pkgs/games/rigsofrods/default.nix             |  9 +--
 pkgs/top-level/all-packages.nix               |  3 +
 3 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/interpreters/angelscript/2.20.nix

diff --git a/pkgs/development/interpreters/angelscript/2.20.nix b/pkgs/development/interpreters/angelscript/2.20.nix
new file mode 100644
index 00000000000..78225a1b542
--- /dev/null
+++ b/pkgs/development/interpreters/angelscript/2.20.nix
@@ -0,0 +1,65 @@
+x@{builderDefsPackage
+  , unzip
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="angelscript";
+    version="2.20.3";
+    name="${baseName}-${version}";
+    url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
+    hash="1gyfi35n7vcm9bm0f1q3va4w8b94avc713b6yqzinzg6dmp1x937";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["prepareBuild" "doMake" "cleanLib" "doMakeInstall" "installDocs"];
+
+  prepareBuild = a.fullDepEntry ''
+    cd angelscript/projects/gnuc
+    sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
+    ensureDir "$out/lib" "$out/bin" "$out/share" "$out/include"
+    export SHARED=1 
+    export VERSION="${version}"
+  '' ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
+
+  cleanLib = a.fullDepEntry ''
+    rm ../../lib/*
+  '' ["minInit"];
+
+  installDocs = a.fullDepEntry ''
+    ensureDir "$out/share/angelscript"
+    cp -r ../../../docs  "$out/share/angelscript"
+  '' ["defEnsureDir" "prepareBuild"];
+      
+  meta = {
+    description = "A light-weight scripting library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = a.lib.licenses.zlib;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://www.angelcode.com/angelscript/downloads.asp";
+    };
+  };
+}) x
+
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 4fa89798306..e7f2b3976cd 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -4,12 +4,13 @@
   }:
 
 stdenv.mkDerivation rec {
-  version = "0.39.4";
+  version = "0.39-svn2267";
   name = "rigsofrods-${version}";
 
-  src = fetchurl {
-    url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2;
-    sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx";
+  src = fetchsvn {
+    url = https://rigsofrods.svn.sourceforge.net/svnroot/rigsofrods/trunk;
+    rev = 2267;
+    sha256 = "19r3v6x1wk3nb1cyixbp1bmdg96h31bxjlsz6zh6qc317wjmy96b";
   };
 
   contentPackSrc = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 802904b1903..af83e765f74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2620,6 +2620,8 @@ let
 
   angelscript = callPackage ../development/interpreters/angelscript {};
 
+  angelscript_2_20 = callPackage ../development/interpreters/angelscript/2.20.nix {};
+
   clisp = callPackage ../development/interpreters/clisp { };
 
   # compatibility issues in 2.47 - at list 2.44.1 is known good
@@ -7961,6 +7963,7 @@ let
 
   rigsofrods = callPackage ../games/rigsofrods {
     mygui = myguiSvn;
+    angelscript = angelscript_2_20;
   };
 
   rogue = callPackage ../games/rogue { };

From c67edd454c4d9846f2a7aab291b722f35f65d0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Feb 2012 23:25:54 +0000
Subject: [PATCH 065/109] QEMU-KVM 1.0 (tentative).

svn path=/nixpkgs/trunk/; revision=32637
---
 pkgs/os-specific/linux/qemu-kvm/1.0.nix | 51 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/os-specific/linux/qemu-kvm/1.0.nix

diff --git a/pkgs/os-specific/linux/qemu-kvm/1.0.nix b/pkgs/os-specific/linux/qemu-kvm/1.0.nix
new file mode 100644
index 00000000000..162fcaee55a
--- /dev/null
+++ b/pkgs/os-specific/linux/qemu-kvm/1.0.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
+, libjpeg, libpng, ncurses, python, glib }:
+
+assert stdenv.isLinux;
+
+let version = "1.0"; in
+stdenv.mkDerivation rec {
+  name = "qemu-kvm-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
+    sha256 = "0vhigv9r9yrhph4wc4mhg99a683iwf121kjigqzg92x2l3ayl4dp";
+  };
+
+  patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
+  postPatch =
+    '' for i in $(find kvm -type f)
+       do
+         sed -i "$i" \
+             -e 's|/bin/bash|/bin/sh|g ;
+                 s|/usr/bin/python|${python}/bin/python|g ;
+                 s|/bin/rm|rm|g'
+       done
+    '';
+
+  configureFlags =
+    [ "--audio-drv-list=alsa"
+      "--smbd=smbd"                               # use `smbd' from $PATH
+    ];
+
+  enableParallelBuilding = true;
+
+  buildInputs =
+    [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
+      ncurses python glib
+    ];
+
+  postInstall =
+    ''
+      # Libvirt expects us to be called `qemu-kvm'.  Otherwise it will
+      # set the domain type to "qemu" rather than "kvm", which can
+      # cause architecture selection to misbehave.
+      ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm
+    '';
+
+  meta = {
+    homepage = http://www.linux-kvm.org/;
+    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af83e765f74..8e5d09c55ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6043,6 +6043,7 @@ let
   pwdutils = callPackage ../os-specific/linux/pwdutils { };
 
   qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { };
+  qemu_kvm_1_0 = callPackage ../os-specific/linux/qemu-kvm/1.0.nix { };
 
   firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };
 

From 8bcba9e6d4e26c3dfec16eac6c93a745e4ad4320 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 00:09:52 +0000
Subject: [PATCH 066/109] moderncv: upgraded to 0.19

svn path=/nixpkgs/trunk/; revision=32664
---
 pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
index b8e27bd93d3..dfd6fd652c2 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@@ -1,6 +1,6 @@
 args: with args;
 rec {
-  name = "moderncv-2012.01.16";
+  name = "moderncv-0.19";
   src = fetchurl {
     url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";
     sha256 = "5cd2117cd2a3572dbc055033ca81ca744ee65918c42d23687e133bb1e6ddd644";

From be0acc8bc1040be42bc6dced65efd30189caac5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 00:09:56 +0000
Subject: [PATCH 067/109] hasktags: ctags/etags for haskell sources

svn path=/nixpkgs/trunk/; revision=32665
---
 .../tools/haskell/hasktags/default.nix            | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/hasktags/default.nix

diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix
new file mode 100644
index 00000000000..a41994746e5
--- /dev/null
+++ b/pkgs/development/tools/haskell/hasktags/default.nix
@@ -0,0 +1,15 @@
+{ cabal, filepath }:
+
+cabal.mkDerivation (self: {
+  pname = "hasktags";
+  version = "0.68.2";
+  sha256 = "0lb28vj8mhaskw3n7wpjgbj0311ywh76yc0ajczzsiqa3p6mypss";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ filepath ];
+  meta = {
+    description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 534cc3aa2f7..62e518b2419 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1571,6 +1571,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   HaRe = callPackage ../development/tools/haskell/HaRe {};
 
+  hasktags = callPackage ../development/tools/haskell/hasktags {};
+
   hlint = callPackage ../development/tools/haskell/hlint {};
 
   hslogger = callPackage ../development/tools/haskell/hslogger {};

From bf4ebdc2bbb08b467de8fbedb163c2fb030e41ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 00:09:59 +0000
Subject: [PATCH 068/109] haskell-HSH: shell scripting in haskell

svn path=/nixpkgs/trunk/; revision=32666
---
 .../libraries/haskell/HSH/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/HSH/default.nix

diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
new file mode 100644
index 00000000000..84e7b85fe65
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HSH/default.nix
@@ -0,0 +1,20 @@
+{ cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
+, regexPosix
+}:
+
+cabal.mkDerivation (self: {
+  pname = "HSH";
+  version = "2.0.3";
+  sha256 = "10ndmzwaf9by8wnawl3p1r7wn6hqigfymv7hd99ayf25dsqwnzx2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    filepath hslogger MissingH mtl regexBase regexCompat regexPosix
+  ];
+  meta = {
+    homepage = "http://software.complete.org/hsh";
+    description = "Library to mix shell scripting with Haskell programs";
+    license = "LGPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 62e518b2419..37eb70f4b59 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -870,6 +870,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hsemail = callPackage ../development/libraries/haskell/hsemail {};
 
+  HSH = callPackage ../development/libraries/haskell/HSH {};
+
   HsSyck = callPackage ../development/libraries/haskell/HsSyck {};
 
   HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {};

From b2356973fe8b6709e86275e57aa03db1e956121e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 00:10:02 +0000
Subject: [PATCH 069/109] haskell-haskdogs: wrapper around hasktags that
 fetches sources for dependencies from hackage

svn path=/nixpkgs/trunk/; revision=32667
---
 .../tools/haskell/haskdogs/default.nix           | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/haskdogs/default.nix

diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix
new file mode 100644
index 00000000000..2a02d92ff41
--- /dev/null
+++ b/pkgs/development/tools/haskell/haskdogs/default.nix
@@ -0,0 +1,16 @@
+{ cabal, Cabal, filepath, HSH }:
+
+cabal.mkDerivation (self: {
+  pname = "haskdogs";
+  version = "0.3";
+  sha256 = "0aji59sazlhn5yardgrsdpf85fvb0mwn4bpslcjxr7mnmpa7j0kz";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ Cabal filepath HSH ];
+  meta = {
+    homepage = "http://github.com/ierton/haskdogs";
+    description = "Generate ctags file for haskell project directory and it's deps";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 37eb70f4b59..8c4e652b34e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1573,6 +1573,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   HaRe = callPackage ../development/tools/haskell/HaRe {};
 
+  haskdogs = callPackage ../development/tools/haskell/haskdogs {};
+
   hasktags = callPackage ../development/tools/haskell/hasktags {};
 
   hlint = callPackage ../development/tools/haskell/hlint {};

From 10e512f2b8b1426bf5e2238a7ff97e6785b719af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 00:10:05 +0000
Subject: [PATCH 070/109] gogoclient: ipv6 tunnel

svn path=/nixpkgs/trunk/; revision=32668
---
 .../linux/gogoclient/config-paths.patch       | 39 +++++++++++++++++++
 pkgs/os-specific/linux/gogoclient/default.nix | 38 ++++++++++++++++++
 .../linux/gogoclient/gcc46-include-fix.patch  | 22 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 101 insertions(+)
 create mode 100644 pkgs/os-specific/linux/gogoclient/config-paths.patch
 create mode 100644 pkgs/os-specific/linux/gogoclient/default.nix
 create mode 100644 pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch

diff --git a/pkgs/os-specific/linux/gogoclient/config-paths.patch b/pkgs/os-specific/linux/gogoclient/config-paths.patch
new file mode 100644
index 00000000000..88358038bc7
--- /dev/null
+++ b/pkgs/os-specific/linux/gogoclient/config-paths.patch
@@ -0,0 +1,39 @@
+diff -urN gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in
+--- gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in	2009-11-20 17:53:12.000000000 +0100
++++ gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in	2012-02-25 15:16:12.758849219 +0100
+@@ -224,7 +224,7 @@
+ #
+ #   broker_list=<file_name>
+ #  
+-broker_list=tsp-broker-list.txt
++broker_list=/var/lib/gogoc/tsp-broker-list.txt
+ 
+ #
+ # Last Server Used File Name:
+@@ -234,7 +234,7 @@
+ #
+ #   last_server=<file_name>
+ #
+-last_server=tsp-last-server.txt
++last_server=/var/lib/gogoc/tsp-last-server.txt
+ 
+ #
+ # Always Use Last Known Working Server:
+@@ -294,7 +294,7 @@
+ #
+ #   log_filename=<file_name>
+ #
+-log_filename=gogoc.log
++log_filename=/var/log/gogoc.log
+ 
+ #
+ # Log File Rotation:
+@@ -313,7 +313,7 @@
+ #
+ #   log_rotation=<yes|no>
+ #
+-log_rotation=yes
++log_rotation=no
+ 
+ #
+ # Log File Rotation Size:
diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix
new file mode 100644
index 00000000000..d1a4bf9feb6
--- /dev/null
+++ b/pkgs/os-specific/linux/gogoclient/default.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchurl, openssl, nettools, iproute, procps}:
+
+let baseName = "gogoclient";
+    version  = "1.2";
+in
+
+stdenv.mkDerivation rec {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz;
+    sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49";
+  };
+  patches = [./gcc46-include-fix.patch ./config-paths.patch ];
+  makeFlags = ["target=linux"];
+  installFlags = ["installdir=$(out)"];
+
+  buildInputs = [openssl];
+
+  preFixup = ''
+    ensureDir $out/share/${name}
+    chmod 444 $out/bin/gogoc.conf
+    mv $out/bin/gogoc.conf $out/share/${name}/gogoc.conf.sample
+    rm $out/bin/gogoc.conf.sample
+
+    substituteInPlace "$out/template/linux.sh" \
+      --replace "/sbin/ifconfig" "${nettools}/sbin/ifconfig" \
+      --replace "/sbin/route"    "${nettools}/sbin/route" \
+      --replace "/sbin/ip"       "${iproute}/sbin/ip" \
+      --replace "/sbin/sysctl"   "${procps}/sbin/sysctl"
+  '';
+
+  meta = {
+    homepage = http://gogonet.gogo6.com;
+    description = "Client to connect to the Freenet6 IPv6 tunnel broker service";
+    maintainers = [stdenv.lib.maintainers.bluescreen303];
+  };
+}
diff --git a/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch b/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch
new file mode 100644
index 00000000000..22ecad187d6
--- /dev/null
+++ b/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch
@@ -0,0 +1,22 @@
+diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc
+--- gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc	2009-11-20 17:34:55.000000000 +0100
++++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc	2012-02-25 15:06:20.764698284 +0100
+@@ -15,6 +15,7 @@
+ // **************************************************************************
+ #include <gogocmessaging/clientmsgsender.h>
+ #include <assert.h>
++#include <stddef.h>
+ 
+ 
+ namespace gogocmessaging
+diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc
+--- gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc	2009-11-20 17:34:56.000000000 +0100
++++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc	2012-02-25 15:06:36.722740288 +0100
+@@ -15,6 +15,7 @@
+ // **************************************************************************
+ #include <gogocmessaging/servermsgsender.h>
+ #include <assert.h>
++#include <stddef.h>
+ 
+ 
+ namespace gogocmessaging
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e5d09c55ed..e74aba5c27c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5989,6 +5989,8 @@ let
 
   numactl = callPackage ../os-specific/linux/numactl { };
 
+  gogoclient = callPackage ../os-specific/linux/gogoclient { };
+
   gw6c = builderDefsPackage (import ../os-specific/linux/gw6c) {
     inherit fetchurl stdenv nettools openssl procps iproute;
   };

From de9ebc460cb59c014e6d5c2d6c1da022ab680aa2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 00:10:09 +0000
Subject: [PATCH 071/109] Added meta.maintainers section.

svn path=/nixpkgs/trunk/; revision=32669
---
 pkgs/development/libraries/haskell/HSH/default.nix  | 4 ++++
 pkgs/development/tools/haskell/haskdogs/default.nix | 4 ++++
 pkgs/development/tools/haskell/hasktags/default.nix | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
index 84e7b85fe65..51782e82a1e 100644
--- a/pkgs/development/libraries/haskell/HSH/default.nix
+++ b/pkgs/development/libraries/haskell/HSH/default.nix
@@ -16,5 +16,9 @@ cabal.mkDerivation (self: {
     description = "Library to mix shell scripting with Haskell programs";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix
index 2a02d92ff41..2e158abaf89 100644
--- a/pkgs/development/tools/haskell/haskdogs/default.nix
+++ b/pkgs/development/tools/haskell/haskdogs/default.nix
@@ -12,5 +12,9 @@ cabal.mkDerivation (self: {
     description = "Generate ctags file for haskell project directory and it's deps";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix
index a41994746e5..d3c373ae4df 100644
--- a/pkgs/development/tools/haskell/hasktags/default.nix
+++ b/pkgs/development/tools/haskell/hasktags/default.nix
@@ -11,5 +11,9 @@ cabal.mkDerivation (self: {
     description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

From 81b3becc7ea4e2a1bffcfbe0fb5e6d2b12b7588b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 10:03:40 +0000
Subject: [PATCH 072/109] haskell-epic: updated to version 0.9.3

svn path=/nixpkgs/trunk/; revision=32670
---
 pkgs/development/compilers/epic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix
index 33087f23c9a..9060d313be5 100644
--- a/pkgs/development/compilers/epic/default.nix
+++ b/pkgs/development/compilers/epic/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "epic";
-  version = "0.9.2";
-  sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw";
+  version = "0.9.3";
+  sha256 = "1x8y3ljha8r52pw83mjfv5i49dq0b7i1xbxg8j9hlvr2vwfa4237";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ Cabal mtl ];

From 409e44cbe173532815473b661244efe63899cdd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 10:03:45 +0000
Subject: [PATCH 073/109] haskell-idris: updated to version 0.9.2

svn path=/nixpkgs/trunk/; revision=32671
---
 pkgs/development/compilers/idris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index e030fee7658..f0fd33e439f 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.1";
-  sha256 = "1yvw15750mqrvq1kd7bsk3ldq3s0z947c4f93pv7008gq5im4cvr";
+  version = "0.9.2";
+  sha256 = "0n4dh3vxkjvw8rb5iqm8lvi21q2ljw2pzn453wfcisdadkpv4fh5";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 026f6e76976095ccec203c114913a851033eef19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 28 Feb 2012 10:08:21 +0000
Subject: [PATCH 074/109] Doxygen: Reinstate version 1.7.

svn path=/nixpkgs/trunk/; revision=32672
---
 .../tools/documentation/doxygen/1.7.nix       | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 ++++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/tools/documentation/doxygen/1.7.nix

diff --git a/pkgs/development/tools/documentation/doxygen/1.7.nix b/pkgs/development/tools/documentation/doxygen/1.7.nix
new file mode 100644
index 00000000000..86f2e8cf2b2
--- /dev/null
+++ b/pkgs/development/tools/documentation/doxygen/1.7.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, perl, flex, bison, qt4 }:
+
+let
+  name = "doxygen-1.7.4";
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
+    sha256 = "0rnzyp5f8c454fdkgpg5hpxwmx642spgxcpw3blbvnyw8129jp44";
+  };
+
+  patches = [ ./tmake.patch ];
+
+  buildInputs =
+    [ perl flex bison ]
+    ++ stdenv.lib.optional (qt4 != null) qt4;
+
+  prefixKey = "--prefix ";
+
+  configureFlags =
+    [ "--dot dot" ]
+    ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";
+
+  preConfigure = stdenv.lib.optionalString (qt4 != null)
+    ''
+      echo "using QTDIR=${qt4}..."
+      export QTDIR=${qt4}
+    '';
+
+  makeFlags = "MAN1DIR=share/man/man1";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    license = "GPLv2+";
+    homepage = "http://doxygen.org/";
+    description = "Doxygen, a source code documentation generator tool";
+
+    longDescription = ''
+      Doxygen is a documentation system for C++, C, Java, Objective-C,
+      Python, IDL (CORBA and Microsoft flavors), Fortran, VHDL, PHP,
+      C\#, and to some extent D.  It can generate an on-line
+      documentation browser (in HTML) and/or an off-line reference
+      manual (in LaTeX) from a set of documented source files.
+    '';
+
+    maintainers = [stdenv.lib.maintainers.simons];
+    platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e74aba5c27c..8b9d0ac32f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3007,6 +3007,15 @@ let
 
   doxygen = lowPrio (doxygen_gui.override { qt4 = null; });
 
+  /* XXX: The LaTeX output with Doxygen 1.8.0 makes LaTeX barf:
+
+       ! You can't use `\/' in vertical mode.
+
+     Thus, keep 1.7 around until a better fix is available.  */
+  doxygen_1_7 = callPackage ../development/tools/documentation/doxygen/1.7.nix {
+    qt4 = null;
+  };
+
   doxygen_gui = callPackage ../development/tools/documentation/doxygen { };
 
   eggdbus = callPackage ../development/tools/misc/eggdbus { };

From 423b5b47bc44d3edd68a09e29298c5c74c6cbbed Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 28 Feb 2012 11:53:34 +0000
Subject: [PATCH 075/109] add python pkgs iptools-0.4.0

svn path=/nixpkgs/trunk/; revision=32676
---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 488fce66feb..4feeaa316e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -597,6 +597,22 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  iptools = buildPythonPackage rec {
+    version = "0.4.0";
+    name = "iptools-${version}";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/i/iptools/iptools-${version}.tar.gz";
+      md5 = "de60e5fab861f29dbf5f4446f8576532";
+    };
+
+    meta = {
+      description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting.";
+      homepage = http://pypi.python.org/pypi/iptools;
+    };
+  };
+
+
   ipy = buildPythonPackage rec {
     version = "0.74";
     name = "ipy-${version}";

From 051129ac799b08bae0d6f2e3381070adc4e8da2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 28 Feb 2012 14:22:20 +0000
Subject: [PATCH 076/109] Doxygen: Add link to the bug report.

svn path=/nixpkgs/trunk/; revision=32677
---
 pkgs/top-level/all-packages.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b9d0ac32f7..07cfb9ff762 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3007,11 +3007,8 @@ let
 
   doxygen = lowPrio (doxygen_gui.override { qt4 = null; });
 
-  /* XXX: The LaTeX output with Doxygen 1.8.0 makes LaTeX barf:
-
-       ! You can't use `\/' in vertical mode.
-
-     Thus, keep 1.7 around until a better fix is available.  */
+  /* XXX: The LaTeX output with Doxygen 1.8.0 makes LaTeX barf.
+     See <https://bugzilla.gnome.org/show_bug.cgi?id=670973>.  */
   doxygen_1_7 = callPackage ../development/tools/documentation/doxygen/1.7.nix {
     qt4 = null;
   };

From 207d5aae28784c6ca9d960fbdfb2cc5dd949dd32 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Feb 2012 15:53:39 +0000
Subject: [PATCH 077/109] * Added SQL::SplitStatement.

svn path=/nixpkgs/trunk/; revision=32678
---
 pkgs/top-level/perl-packages.nix | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 85d50caf863..842f127f576 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3022,10 +3022,27 @@ rec {
       url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/${name}.tar.gz";
       sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg";
     };
-    propagatedBuildInputs = [
-      SQLAbstract TestException DBI TestDeep
-    ];
-    buildInputs = [TestPod TestPodCoverage];
+    propagatedBuildInputs =
+      [ SQLAbstract TestException DBI TestDeep ];
+    buildInputs = [ TestPod TestPodCoverage ];
+  };
+
+  SQLSplitStatement = buildPerlPackage rec {
+    name = "SQL-SplitStatement-1.00020";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/SQL/${name}.tar.gz";
+      sha256 = "0bqg45k4c9qkb2ypynlwhpvzsl4ssfagmsalys18s5c79ps30z7p";
+    };
+    buildInputs = [ TestException ];
+    propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ];    
+  };
+
+  SQLTokenizer = buildPerlPackage rec {
+    name = "SQL-Tokenizer-0.24";
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/SQL/${name}.tar.gz";
+      sha256 = "1qa2dfbzdlr5qqdam9yn78z5w3al5r8577x06qan8wv58ay6ka7s";
+    };
   };
 
   SQLTranslator = buildPerlPackage rec {

From a70a76086c2553000497ab21dc371bc296c3e3d4 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Tue, 28 Feb 2012 16:26:55 +0000
Subject: [PATCH 078/109] Latest version of libzip places zipconf.h where
 mysqlworkbench cannot find it and so mysqlworkbench does not build.  This
 links it to somewhere mysqlworkbench looks.

I think the openoffice build also failed because of this.

svn path=/nixpkgs/trunk/; revision=32679
---
 pkgs/development/libraries/libzip/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 0c490c63411..48ef55892c8 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
   
   propagatedBuildInputs = [ zlib ];
 
+  # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice
+  # had this same problem.  This links it somewhere that mysqlworkbench looks.
+  postInstall = ''
+    ( cd $out/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h )
+  '';
+
   meta = {
     homepage = http://www.nih.at/libzip;
     description = "A C library for reading, creating and modifying zip archives";

From bd68cc6f5b9680cf3197e3306850a101e7b69fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 28 Feb 2012 17:10:50 +0000
Subject: [PATCH 079/109] nix-build: Honor user-provided `failureHook'.

svn path=/nixpkgs/trunk/; revision=32680
---
 pkgs/build-support/release/nix-build.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index a32f0e07a0c..f734e1eefe5 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -12,6 +12,7 @@
 , lcovExtraTraceFiles ? []
 , src, stdenv
 , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build"
+, failureHook ? null
 , ... } @ args:
 
 stdenv.mkDerivation (
@@ -37,7 +38,8 @@ stdenv.mkDerivation (
         fi
       '';
 
-    failureHook = ''
+    failureHook = (stdenv.lib.optionalString (failureHook != null) failureHook) +
+    ''
       if test -n "$succeedOnFailure"; then
           if test -n "$keepBuildDirectory"; then
               KEEPBUILDDIR="$out/`basename $TMPDIR`"

From 9a5c6611d09c5dfbbef015e4a7de29f20fc68d65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2012 17:34:39 +0000
Subject: [PATCH 080/109] moderncv: updated sha hash

svn path=/nixpkgs/trunk/; revision=32681
---
 pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
index dfd6fd652c2..f93724e4af1 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@@ -3,7 +3,7 @@ rec {
   name = "moderncv-0.19";
   src = fetchurl {
     url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";
-    sha256 = "5cd2117cd2a3572dbc055033ca81ca744ee65918c42d23687e133bb1e6ddd644";
+    sha256 = "0i6nvpkb2fqkgrl26bf431cyckklra0wlcsh0ny2smx3s9y13ljw";
   };
 
   buildInputs = [texLive unzip];

From 6c13f317e9b9b44e0e0606a3f1ab987fbec5ece9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Feb 2012 18:40:27 +0000
Subject: [PATCH 081/109] * Latest PostgreSQL releases.

svn path=/nixpkgs/trunk/; revision=32684
---
 pkgs/servers/sql/postgresql/8.3.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix
index ba0d57b3654..c69cb135f7c 100644
--- a/pkgs/servers/sql/postgresql/8.3.x.nix
+++ b/pkgs/servers/sql/postgresql/8.3.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.3.17"; in
+let version = "8.3.18"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0xq8yg8qwd4qvjk6764argaxl6fribyf1xnxmdsk4xfcmgmfw5gv";
+    sha256 = "0iip7irc8sqz75w6p52fpdfqs4jlqchpzvp0w5s95w2ri5591d2x";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 20b9bca5144..8460a8f41d1 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.4.10"; in
+let version = "8.4.11"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1yvwn2qpn2dpgfi496r1zl8b8xy52lb2pprg076pvc37sklq77vl";
+    sha256 = "13ww30xv2pwd5hy1x5lsmba4jc59n6f6nz0dc29bb0k2s7qrzg2v";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index 6813bd927c8..5b9c565d802 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.0.6"; in
+let version = "9.0.7"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "317d99d2ff9e1de8da0cae107bc06c9fd455b1df0c0fb77b8fbb61fb08276056";
+    sha256 = "0cyqlr4c9jl4d786s0h8d45vkx6343f664ys2jamyncb3pbjdgns";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 161c3dc2ccf..63c7255559c 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.1.2"; in
+let version = "9.1.3"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0c6vwlfxppjvrikqfq6s87sxmxxvsx1qq03bwgk589sv9x8zym4d";
+    sha256 = "1mfmqimd3fvvpw60b0haql510l00nhyfgp4wpkcw2ca0c8580ybs";
   };
 
   buildInputs = [ zlib readline ];

From 1ad3da0ca888b860bac78a7c11a68e6afbfd3ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 28 Feb 2012 23:01:25 +0000
Subject: [PATCH 082/109] Taking back 32635. An older Rigs of Rods does not
 work better. Same throttle issues. Let's keep with 0.39.4.

svn path=/nixpkgs/trunk/; revision=32685
---
 .../interpreters/angelscript/2.20.nix         | 65 -------------------
 pkgs/games/rigsofrods/default.nix             |  9 ++-
 pkgs/top-level/all-packages.nix               |  3 -
 3 files changed, 4 insertions(+), 73 deletions(-)
 delete mode 100644 pkgs/development/interpreters/angelscript/2.20.nix

diff --git a/pkgs/development/interpreters/angelscript/2.20.nix b/pkgs/development/interpreters/angelscript/2.20.nix
deleted file mode 100644
index 78225a1b542..00000000000
--- a/pkgs/development/interpreters/angelscript/2.20.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="angelscript";
-    version="2.20.3";
-    name="${baseName}-${version}";
-    url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    hash="1gyfi35n7vcm9bm0f1q3va4w8b94avc713b6yqzinzg6dmp1x937";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["prepareBuild" "doMake" "cleanLib" "doMakeInstall" "installDocs"];
-
-  prepareBuild = a.fullDepEntry ''
-    cd angelscript/projects/gnuc
-    sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
-    ensureDir "$out/lib" "$out/bin" "$out/share" "$out/include"
-    export SHARED=1 
-    export VERSION="${version}"
-  '' ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-
-  cleanLib = a.fullDepEntry ''
-    rm ../../lib/*
-  '' ["minInit"];
-
-  installDocs = a.fullDepEntry ''
-    ensureDir "$out/share/angelscript"
-    cp -r ../../../docs  "$out/share/angelscript"
-  '' ["defEnsureDir" "prepareBuild"];
-      
-  meta = {
-    description = "A light-weight scripting library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.zlib;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.angelcode.com/angelscript/downloads.asp";
-    };
-  };
-}) x
-
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index e7f2b3976cd..4fa89798306 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -4,13 +4,12 @@
   }:
 
 stdenv.mkDerivation rec {
-  version = "0.39-svn2267";
+  version = "0.39.4";
   name = "rigsofrods-${version}";
 
-  src = fetchsvn {
-    url = https://rigsofrods.svn.sourceforge.net/svnroot/rigsofrods/trunk;
-    rev = 2267;
-    sha256 = "19r3v6x1wk3nb1cyixbp1bmdg96h31bxjlsz6zh6qc317wjmy96b";
+  src = fetchurl {
+    url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2;
+    sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx";
   };
 
   contentPackSrc = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07cfb9ff762..088ee454044 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2620,8 +2620,6 @@ let
 
   angelscript = callPackage ../development/interpreters/angelscript {};
 
-  angelscript_2_20 = callPackage ../development/interpreters/angelscript/2.20.nix {};
-
   clisp = callPackage ../development/interpreters/clisp { };
 
   # compatibility issues in 2.47 - at list 2.44.1 is known good
@@ -7972,7 +7970,6 @@ let
 
   rigsofrods = callPackage ../games/rigsofrods {
     mygui = myguiSvn;
-    angelscript = angelscript_2_20;
   };
 
   rogue = callPackage ../games/rogue { };

From d4960f72bec068336819f3258fa67f1b1b4a6bd7 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Wed, 29 Feb 2012 12:50:17 +0000
Subject: [PATCH 083/109] Added an optional parameter to "make-startupitem" to
 provide a prefix to the ".desktop" file.

svn path=/nixpkgs/trunk/; revision=32686
---
 pkgs/build-support/make-startupitem/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix
index 07cdee600d4..dc78b8a704e 100644
--- a/pkgs/build-support/make-startupitem/default.nix
+++ b/pkgs/build-support/make-startupitem/default.nix
@@ -2,8 +2,9 @@
 # as autostart item.
 
 {stdenv, lib}:
-{ name     # name of the desktop file (without .desktop)
-, package  # package where the desktop file resides in
+{ name            # name of the desktop file (without .desktop)
+, package         # package where the desktop file resides in
+, srcPrefix ? ""  # additional prefix that the desktop file may have in the 'package'
 , after ? null
 , condition ? null
 , phase ? "2"
@@ -20,7 +21,7 @@ stdenv.mkDerivation {
   buildCommand = ''
     ensureDir $out/share/autostart
     target=${name}.desktop
-    cp ${package}/share/applications/${name}.desktop $target
+    cp ${package}/share/applications/${srcPrefix}${name}.desktop $target
     chmod +rw $target
     echo "X-KDE-autostart-phase=${phase}" >> $target
     ${lib.optionalString (after != null) ''echo "${after}" >> $target''}
@@ -31,4 +32,4 @@ stdenv.mkDerivation {
   # this will automatically put 'package' in the environment when you
   # put its startup item in there.
   propagatedBuildInputs = [ package ];
-}
\ No newline at end of file
+}

From d9f5e277a5471f1c03d14dced75738b62d323b56 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Wed, 29 Feb 2012 12:51:06 +0000
Subject: [PATCH 084/109] OCamlMakefile update.

svn path=/nixpkgs/trunk/; revision=32687
---
 .../ocaml-modules/ocamlmake/default.nix       | 20 +++++++++++++------
 .../ocaml-modules/ocamlmake/setup-hook.sh     |  5 +++++
 .../ocaml-modules/pycaml/default.nix          |  4 ++--
 3 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh

diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix
index 69386bd7578..23858576efd 100644
--- a/pkgs/development/ocaml-modules/ocamlmake/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix
@@ -1,16 +1,24 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "ocaml-make-6.33.0";
+let
+
+  version = "6.36.0";
+  sha256 = "7c9a771d79bf945050dc7530957f4b61669976177818185e64c002cbfd75e3a2";
+
+in stdenv.mkDerivation {
+  name = "ocaml-make-${version}";
 
   src = fetchurl {
-    url = "http://www.ocaml.info/ocaml_sources/ocaml-make-6.33.0.tar.gz";
-    sha256 = "3054303ba04e4bbbe038e08310fabc3e5a0e3899bbba33d9ac5ed7a1b9d1e05a";
+    url = "http://hg.ocaml.info/release/ocaml-make/archive/release-${version}.tar.bz2";
+    inherit sha256;
   };
 
-  phases = [ "unpackPhase" "installPhase" ];
+  installPhase = ''
+    ensureDir "$out/include/"
+    cp OCamlMakefile "$out/include/"
+  '';
 
-  installPhase = "cp OCamlMakefile $out";
+  setupHook = ./setup-hook.sh;
 
   meta = {
     homepage = "http://www.ocaml.info/home/ocaml_sources.html";
diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
new file mode 100644
index 00000000000..876556a7b92
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
@@ -0,0 +1,5 @@
+addOcamlMakefile () {
+    export OCAMLMAKEFILE="@out@/include/OCamlMakefile"
+}
+
+envHooks=(${envHooks[@]} addOcamlMakefile)
diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix
index af7207064ba..b6c0df5ac15 100644
--- a/pkgs/development/ocaml-modules/pycaml/default.nix
+++ b/pkgs/development/ocaml-modules/pycaml/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     sha256 = "ff6d863c42b4ef798f50ff5eff77b47b77b5c0d28b6f65364e8a436a216dc591";
   };
 
-  buildInputs = [ocaml findlib python]; 
+  buildInputs = [ocaml findlib python ocaml_make];
 
   createFindlibDestdir = true;
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   # fix some paths to the appropriate store paths.
   patchPhase = ''
-    sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}|g'
+    sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g'
     sed -i "Makefile" -e's|/usr|${python}|g'
     '';
 

From 6e8c9ea906e80e6af78f1ec74213787dac0ad354 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Wed, 29 Feb 2012 12:53:13 +0000
Subject: [PATCH 085/109] ocaml-mode for emacs.

There seem to exist multiple (very old) versions.
I'm taking the one shipped with the ocaml compiler, which is hopefully the "most appropriate".

svn path=/nixpkgs/trunk/; revision=32688
---
 .../editors/emacs-modes/ocaml/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/ocaml/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
new file mode 100644
index 00000000000..1d81a0b7ff1
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, emacs, ocaml }:
+
+# this package installs the emacs-mode which
+# resides in the ocaml compiler sources.
+
+let version = stdenv.lib.removePrefix "ocaml-" ocaml.name;
+in stdenv.mkDerivation {
+  name = "ocaml-mode-${version}";
+  inherit (ocaml) prefixKey src;
+
+  # a quick configure to get the Makefile generated. Since
+  # we do not build the ocaml itself, we don't really
+  # need it to support any features.
+  configureFlags = [ "-no-tk" "-no-curses" "-no-pthread" ];
+
+  buildInputs = [ emacs ];
+  dontBuild = true;
+
+  installPhase = ''
+    cd emacs;
+    ensureDir "$out/share/emacs/site-lisp" "$out/bin"
+    EMACSDIR=$out/share/emacs/site-lisp make simple-install install-ocamltags
+  '';
+
+  meta = {
+    homepage = http://caml.inria.fr;
+    description = "OCaml mode package for Emacs";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 088ee454044..6f37b48da68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6672,6 +6672,8 @@ let
 
     haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
 
+    ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
+
     hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
 
     htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };

From 45120513fb73699a0bbeccf26e61d86bad1868d3 Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Wed, 29 Feb 2012 12:54:35 +0000
Subject: [PATCH 086/109] Cosmetic changes to newsreaders/kwooty and dropbox
 expressions.

svn path=/nixpkgs/trunk/; revision=32689
---
 pkgs/applications/networking/dropbox/default.nix   | 14 +++++++-------
 .../networking/newsreaders/kwooty/default.nix      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 5e7e921710f..936fedd1491 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,7 +23,7 @@ let
   sha256 = "72aeaf00727da9f3fe39386dcf883bb303de928ba43c738fcc5bb62b93eca252";
 
   # relative location where the dropbox libraries are stored
-  sharedir = "share/dropbox";
+  appdir = "opt/dropbox";
 
   # Libraries referenced by dropbox binary.
   # Be aware that future versions of the dropbox binary may refer
@@ -60,17 +60,17 @@ in stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir "$out/${sharedir}"
-    cp -r .dropbox-dist/* "$out/${sharedir}/"
+    ensureDir "$out/${appdir}"
+    cp -r .dropbox-dist/* "$out/${appdir}/"
     ensureDir "$out/bin"
-    ln -s "$out/${sharedir}/dropbox" "$out/bin/dropbox"
+    ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
 
     patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
-      "$out/${sharedir}/dropbox"
+      "$out/${appdir}/dropbox"
 
-    RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${sharedir}
+    RPATH=${ldpath}:${gcc.gcc}/lib64:$out/${appdir}
     echo "updating rpaths to: $RPATH"
-    find "$out/${sharedir}" -type f -a -perm +0100 \
+    find "$out/${appdir}" -type f -a -perm +0100 \
       -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
 
     ensureDir "$out/share/applications"
diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix
index 003157dd129..15b1c6c6b4e 100644
--- a/pkgs/applications/networking/newsreaders/kwooty/default.nix
+++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
       libX11 libXext libXft
     ];
                   
-  meta = with stdenv.lib; {
+  meta = {
     description = "Binary news reader of KDE";
   };
 }

From 298f4df4afb5c60bd686f13763ea6e2d0a7080ed Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Wed, 29 Feb 2012 12:55:51 +0000
Subject: [PATCH 087/109] Changed 'myEnvFun' to in addition put a script in
 'bin' so that you can run '. load-<name>-env' to load your environment.

svn path=/nixpkgs/trunk/; revision=32690
---
 pkgs/misc/my-env/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 76080d8e114..8485346e67b 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -45,7 +45,7 @@ mkDerivation {
   # the buildNativeInputs environment variable.
   buildNativeInputs = [ ] ++ buildInputs ;
   name = "env-${name}";
-  phases = [ "buildPhase" ];
+  phases = [ "buildPhase" "fixupPhase" ];
   setupNew = substituteAll {
     src = ../../stdenv/generic/setup.sh;
     preHook="";
@@ -56,7 +56,7 @@ mkDerivation {
 
   buildPhase = ''
     set -x
-    mkdir -p "$out/dev-envs" "$out/nix-support"
+    mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin"
     s="$out/nix-support/setup-new-modified"
     cp "$setupNew" "$s"
     # shut some warning up.., do not use set -e
@@ -111,6 +111,12 @@ mkDerivation {
       export PATH
       echo $name loaded
     EOF
-    exit 0
+
+    cat >> "$out/bin/load-''${name/env-/}-env" << EOF
+    #!/bin/sh
+
+    source "$out/dev-envs/''${name/env-/}"
+    EOF
+    chmod +x "$out/bin/load-''${name/env-/}-env" 
   '';
 }

From cff68ececb80e32b2047b2c1a1759ef59b8d929d Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 29 Feb 2012 13:29:59 +0000
Subject: [PATCH 088/109] network-manager: version bump

svn path=/nixpkgs/trunk/; revision=32691
---
 pkgs/tools/networking/network-manager/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 8ca0be99039..49aacaa4ef9 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib
+{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
 , udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
 , libgcrypt, dnsmasq, avahi }:
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "0.9.0";
+  version = "0.9.2.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.bz2";
-    sha256 = "0kvi767c224zlja65r8gixmhj57292k0gsxa0217lw5i99l2incq";
+    url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
+    sha256 = "1pvd49ji7mh8ww2rfbvq6hmmjms5mb7w10fr7ihgzqbg589zjyj3";
   };
 
   # Right now we hardcode quite a few paths at build time. Probably we should
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
     "--with-crypto=gnutls" "--disable-more-warnings" ];
 
-  buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp ];
+  buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp xz ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
 

From b01a720d65eef145be3e3c6d0f9145a014db83b0 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 29 Feb 2012 13:30:01 +0000
Subject: [PATCH 089/109] TOR: version bump

svn path=/nixpkgs/trunk/; revision=32692
---
 pkgs/tools/security/tor/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 62a75c16b4e..3d2360196a6 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, libevent, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.1.30";
+  name = "tor-0.2.2.35";
 
   src = fetchurl {
     url = "http://www.torproject.org/dist/${name}.tar.gz";
-    sha256 = "02g15k8w5r57r9r6lz0sxzzvqx200y397y142cjswsd4zyla2lpk";
+    sha256 = "f141a41fffd31494a0f96ebbb6b999eab33ce62d5c31f81222a0acd034adbf3a";
   };
 
-  patchPhase =
+#  patchPhase =
     # DNS lookups fail in chroots.
-    '' sed -i "src/or/test.c" -es/localhost/127.0.0.1/g
-    '';
+#    '' sed -i "src/or/test.c" -es/localhost/127.0.0.1/g
+#    '';
 
   buildInputs = [ libevent openssl zlib ];
 

From 0def4140f639b1da0b841ca180b36345b733a762 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 29 Feb 2012 13:30:04 +0000
Subject: [PATCH 090/109] network-manager-applet: version bump

svn path=/nixpkgs/trunk/; revision=32693
---
 pkgs/tools/networking/network-manager-applet/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index cb0ffe32159..0a8832f4b51 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade
 , networkmanager, GConf, libnotify, gnome_keyring, dbus_glib
-, polkit, xz }:
+, polkit, isocodes, xz }:
 
 let
   pn = "network-manager-applet";
   major = "0.9";
-  version = "${major}.0";
+  version = "${major}.2.0";
 in
 
 stdenv.mkDerivation rec {
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
-    sha256 = "097y7c29bgd9wm0im06ka3cd94zssg4s626y5lw7yrypq3hzg18f";
+    sha256 = "ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de";
   };
 
   buildInputs = [ gtk libglade networkmanager GConf libnotify gnome_keyring
-    polkit];
+    polkit isocodes ];
 
   buildNativeInputs = [ intltool pkgconfig xz ];
 

From bf667c93899521f8a6ea4862f9b4949b81e228b9 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 29 Feb 2012 13:30:06 +0000
Subject: [PATCH 091/109] Vidalia: packaged

svn path=/nixpkgs/trunk/; revision=32694
---
 pkgs/tools/security/vidalia/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/security/vidalia/default.nix

diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
new file mode 100644
index 00000000000..31de710b3aa
--- /dev/null
+++ b/pkgs/tools/security/vidalia/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, qt4 }:
+stdenv.mkDerivation rec {
+
+  name = "vidalia-${version}";
+  version = "0.2.15";
+
+  src = fetchurl {
+    url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz";
+    sha256 = "02c8q6l93w1f9jwnl13jvpzk8vms3lrqz41bs36ny7cfzgczv625";
+  };
+
+  buildInputs = [ cmake qt4 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.torproject.org/projects/vidalia.html.en;
+    description = "a cross-platform graphical controller for the Tor software, built using the Qt framework";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.all;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f37b48da68..3b0becac70e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1460,6 +1460,8 @@ let
 
   vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};
 
+  vidalia = callPackage ../tools/security/vidalia { };
+
   vbetool = builderDefsPackage ../tools/system/vbetool {
     inherit pciutils libx86 zlib;
   };

From cf8d3fa4b9c5cb5edb23ce257a0f4ad285c323f8 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 29 Feb 2012 13:30:10 +0000
Subject: [PATCH 092/109] Apparmor: packaged

svn path=/nixpkgs/trunk/; revision=32695
---
 pkgs/os-specific/linux/apparmor/default.nix | 93 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +
 2 files changed, 97 insertions(+)
 create mode 100644 pkgs/os-specific/linux/apparmor/default.nix

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
new file mode 100644
index 00000000000..8a7d2b9e458
--- /dev/null
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -0,0 +1,93 @@
+{ stdenv, fetchurl
+, autoconf, automake, libtool, makeWrapper
+, perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext, bash, pam, TermReadKey, RpcXML, swig}:
+stdenv.mkDerivation rec {
+
+  name = "apparmor-${version}";
+  version = "2.6.1";
+
+  src = fetchurl {
+    url = "http://launchpad.net/apparmor/2.6/2.6.1/+download/${name}.tar.gz";
+    sha256 = "1x7225xgzyc5agbn41xsip236anr1kmaw70xc94pag82q7c1bc4w";
+  };
+
+  buildInputs = [ autoconf automake libtool perl bison flex gettext which rpm tetex LocaleGettext pam TermReadKey RpcXML swig makeWrapper ];
+
+  prePatch = ''
+    substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc}/include"
+    substituteInPlace libraries/libapparmor/src/Makefile.am --replace "/usr/include" "${glibc}/include"
+    substituteInPlace common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"
+    substituteInPlace common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"
+
+    substituteInPlace parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison"
+    substituteInPlace parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex"
+    substituteInPlace parser/Makefile --replace "/usr/include/bits/socket.h" "${glibc}/include/bits/socket.h"
+    substituteInPlace parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
+
+    substituteInPlace parser/tst/gen-xtrans.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
+    substituteInPlace parser/tst/Makefile --replace "/usr/bin/prove" "${perl}/bin/prove"
+    substituteInPlace parser/tst/Makefile --replace "./caching.sh" "${bash}/bin/bash ./caching.sh"
+  '';
+
+  buildPhase =''
+    PERL5LIB=$PERL5LIB:$out/lib/perl5/site_perl:$out/lib
+
+    cd libraries/libapparmor
+    ./autogen.sh
+    ./configure --prefix=$out --with-perl	# see below
+    make
+    make check
+    make install
+    ensureDir $out/lib/perl5/site_perl/
+    cp swig/perl/LibAppArmor.pm $out/lib/perl5/site_perl/
+    cp swig/perl/LibAppArmor.bs $out/lib/perl5/site_perl/
+# this is automatically copied elsewhere....
+
+    cd ../../utils
+    make
+    make install DESTDIR=$out BINDIR=$out/bin VENDOR_PERL=/lib/perl5/site_perl
+
+    cd ../parser
+    make
+    make install DESTDIR=$out DISTRO=unknown
+
+#    cd ../changehat/mod_apparmor
+#    make		# depends on libapparmor having been built first
+#    make install
+
+    cd ../changehat/pam_apparmor
+    make		# depends on libapparmor having been built first
+    make install DESTDIR=$out
+
+    cd ../../profiles
+LD_LIBRARY_PATH=$out/lib    make
+#LD_LIBRARY_PATH=$out/lib    make check	# depends on the parser having been built first
+    make install DESTDIR=$out
+
+  '';
+  installPhase = ''
+    for i in $out/bin/*;  do
+      wrapProgram $i --prefix PERL5LIB : "$PERL5LIB:$out/lib/perl5/5.10.1/i686-linux-thread-multi/"
+    done
+  '';
+  passthru = {
+    linux_2_6_37_patch = {
+      name= "apparmor";
+      features.apparmor = true;
+      patch = [
+	"${src}/kernel-patches/2.6.37/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch"
+	"${src}/kernel-patches/2.6.37/0002-AppArmor-compatibility-patch-for-v5-interface.patch"
+	"${src}/kernel-patches/2.6.37/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch"
+      ];
+    };
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://apparmor.net/;
+    description = "A Linux application security system";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b0becac70e..01319636b67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5302,6 +5302,10 @@ let
 
   microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { };
 
+  apparmor = callPackage ../os-specific/linux/apparmor {
+    inherit (perlPackages) LocaleGettext TermReadKey RpcXML;
+  };
+
   bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { };
 
   bluez = callPackage ../os-specific/linux/bluez { };

From 6e5a378f483c56f87bc57deb2d97443b0f834b31 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 29 Feb 2012 13:30:14 +0000
Subject: [PATCH 093/109] Vidalia: version bump

svn path=/nixpkgs/trunk/; revision=32696
---
 pkgs/tools/security/vidalia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
index 31de710b3aa..243604c2c79 100644
--- a/pkgs/tools/security/vidalia/default.nix
+++ b/pkgs/tools/security/vidalia/default.nix
@@ -2,11 +2,11 @@
 stdenv.mkDerivation rec {
 
   name = "vidalia-${version}";
-  version = "0.2.15";
+  version = "0.2.17";
 
   src = fetchurl {
     url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz";
-    sha256 = "02c8q6l93w1f9jwnl13jvpzk8vms3lrqz41bs36ny7cfzgczv625";
+    sha256 = "0x0vb37h2d5njxmqkss03ybv7b7jw25682xb793mix1m8l0hs44r";
   };
 
   buildInputs = [ cmake qt4 ];

From 287f1f0f651c12ba291999b8e1623323597bdb3f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Wed, 29 Feb 2012 14:29:49 +0000
Subject: [PATCH 094/109] spring-lobby: bump version to 0.139

svn path=/nixpkgs/trunk/; revision=32697
---
 pkgs/games/spring/spring-lobby.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/spring/spring-lobby.nix b/pkgs/games/spring/spring-lobby.nix
index 9365f2e6585..4e34d3807ca 100644
--- a/pkgs/games/spring/spring-lobby.nix
+++ b/pkgs/games/spring/spring-lobby.nix
@@ -3,17 +3,17 @@
 stdenv.mkDerivation rec {
 
   name = "spring-lobby-${version}";
-  version = "0.116";
+  version = "0.139";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "04gb2dc2xc0lj2d14jzz330kn5faffdz3xph9bg2m68b28fv0xsk";
+    sha256 = "0ibvv2p4c0qa933mr3hfn5lp8c6h1dycl6k6i1n2gvpa8jr598m5";
   };
 
   buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost ];
 
   prePatch = ''
-    substituteInPlace tools/regen_config_header.sh --replace "#!/bin/bash" "#!${bash}/bin/bash"
+    substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace tools/test-susynclib.awk --replace "#!/usr/bin/awk" "#!${gawk}/bin/awk"
     substituteInPlace CMakeLists.txt --replace "boost_system-mt" "boost_system"
   '';
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
     description = "A free cross-platform lobby client for the Spring RTS project.";
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }
\ No newline at end of file

From 55ce36faee4a6a2eba7bd07196d424f37266b83c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 29 Feb 2012 14:35:34 +0000
Subject: [PATCH 095/109] * Updated Leiningen to 1.7.0 (contributed by Phil
 Hagelberg; added a   call to patchShebangs to fix the reference to
 /bin/bash).

svn path=/nixpkgs/trunk/; revision=32698
---
 .../tools/build-managers/leiningen/builder.sh    |  2 ++
 .../tools/build-managers/leiningen/default.nix   | 13 ++++++-------
 .../tools/build-managers/leiningen/lein.patch    | 16 ++++++----------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh
index 65d318c8f1e..2ee86d86d77 100644
--- a/pkgs/development/tools/build-managers/leiningen/builder.sh
+++ b/pkgs/development/tools/build-managers/leiningen/builder.sh
@@ -15,6 +15,8 @@ cp -v $clojuresrc $out/lib
 patch --verbose $out_bin -p0 < $patches
 chmod -v 755 $out_bin
 
+patchShebangs $out
+
 echo "Testing out \"lein version\"..."
 $out_bin version
 echo "Success."
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index 61a0374bdad..efdb578a61b 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -2,17 +2,17 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "1.6.2";
+  version = "1.7.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://raw.github.com/technomancy/leiningen/stable/bin/lein-pkg";
-    sha256 = "e177a493ed0c4a7874f1391d5cc72cc1e541e55ed3d6e075feec87b5da6f8277";
+    url = "https://raw.github.com/technomancy/leiningen/1.7.0/bin/lein-pkg";
+    sha256 = "1339f6ffc7bae3171174fc9eae990f5b9710ff2804038e931d531632c57f189c";
   };
 
   jarsrc = fetchurl {
-    url = "https://github.com/downloads/technomancy/leiningen/leiningen-1.6.2-standalone.jar";
-    sha256 = "e35272556ece82d9a6a54b86266626da1b5f990ff556639dd7dd1025d6ed4226";
+    url = "https://github.com/downloads/technomancy/leiningen/leiningen-1.7.0-standalone.jar";
+    sha256 = "501eaa1c2a19ca4ffc2fde1776552cb513d69ee874abb547c40cee92156e50bf";
   };
 
   clojuresrc = fetchurl {
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/technomancy/leiningen;
     description = "Project automation for Clojure";
     license = "EPL";
-
     platforms = stdenv.lib.platforms.unix;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/build-managers/leiningen/lein.patch b/pkgs/development/tools/build-managers/leiningen/lein.patch
index 1a7157568e4..2edf1370ff4 100644
--- a/pkgs/development/tools/build-managers/leiningen/lein.patch
+++ b/pkgs/development/tools/build-managers/leiningen/lein.patch
@@ -1,15 +1,14 @@
---- lein-pkg	2012-01-09 20:47:44.000000000 -0800
-+++ lein-pkg-nix	2012-01-09 20:45:01.000000000 -0800
-@@ -70,7 +70,7 @@
+--- lein-pkg	2012-02-28 15:26:40.000000000 -0800
++++ lein-pkg-nix	2012-02-28 17:17:02.000000000 -0800
+@@ -71,30 +71,14 @@
  LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
  LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
  CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
 -CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
 +CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar"
- NULL_DEVICE=/dev/null
  
  # apply context specific CLASSPATH entries
-@@ -78,23 +78,7 @@
+ if [ -f .lein-classpath ]; then
      CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
  fi
  
@@ -26,11 +25,8 @@
 -
 -# Do not use installed leiningen jar during self-compilation
 -if ! { [ "$1" = "compile" ] &&
--       grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
--         project.clj ;}; then
+-        grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
+-            project.clj ;}; then
 -    CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
 -fi
 +CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*"
- 
- if [ $DEBUG ]; then
-     echo $CLASSPATH

From ad4b594ccedd91bcdfcdf93dcecc9f077b2465d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 17:24:27 +0000
Subject: [PATCH 096/109] haskell-hxt: updated to version 9.2.2

svn path=/nixpkgs/trunk/; revision=32699
---
 pkgs/development/libraries/haskell/hxt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index cc1827ac342..0e1668a5818 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hxt";
-  version = "9.2.1";
-  sha256 = "0172icb36wx4fb6q3xq7pcs85d2hnn4bznq3wjwhval10mayri8y";
+  version = "9.2.2";
+  sha256 = "0ichjpshq10b11dyfv1q7rs2m190x3gplx6k54amlxv45nwd1s6r";
   buildDepends = [
     binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
     hxtUnicode mtl network parsec

From 5f4c5c106acaf8abf368478d14cfd2281f66541d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 17:24:31 +0000
Subject: [PATCH 097/109] haskell-stm: updated to version 2.3

svn path=/nixpkgs/trunk/; revision=32700
---
 pkgs/development/libraries/haskell/stm/2.3.nix | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/stm/2.3.nix

diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix
new file mode 100644
index 00000000000..7057ede7052
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm/2.3.nix
@@ -0,0 +1,16 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "stm";
+  version = "2.3";
+  sha256 = "1321l1qkmvnqdw73i21jnh2b8c1iw1mxjbp23hmqdvljjb9mlzsm";
+  meta = {
+    description = "Software Transactional Memory";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8c4e652b34e..00217ee68ad 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -148,7 +148,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     regexBase    = self.regexBase_0_93_2;       # 7.4.1 ok
     regexCompat  = self.regexCompat_0_93_1;     # 7.4.1 ok
     regexPosix   = self.regexPosix_0_95_1;      # 7.4.1 ok
-    stm          = self.stm_2_2_0_1;            # 7.4.1 ok
+    stm          = self.stm_2_3;		# 7.4.1 ok
     syb          = self.syb_0_3_6;              # 7.4.1 ok
     xhtml        = self.xhtml_3000_2_0_5;       # 7.4.1 ok
     zlib         = self.zlib_0_5_3_3;           # 7.4.1 ok
@@ -1287,7 +1287,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   stm_2_1_1_2 = callPackage ../development/libraries/haskell/stm/2.1.1.2.nix {};
   stm_2_1_2_1 = callPackage ../development/libraries/haskell/stm/2.1.2.1.nix {};
   stm_2_2_0_1 = callPackage ../development/libraries/haskell/stm/2.2.0.1.nix {};
-  stm = self.stm_2_1_1_2;
+  stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {};
+  stm = self.stm_2_3;
 
   storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
 

From 708e6f487d6e136bad9954e61d324a14866347b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 17:30:39 +0000
Subject: [PATCH 098/109] haskell-HSH: updated to version 2.0.4

svn path=/nixpkgs/trunk/; revision=32701
---
 pkgs/development/libraries/haskell/HSH/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
index 51782e82a1e..ad6ee08bffd 100644
--- a/pkgs/development/libraries/haskell/HSH/default.nix
+++ b/pkgs/development/libraries/haskell/HSH/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HSH";
-  version = "2.0.3";
-  sha256 = "10ndmzwaf9by8wnawl3p1r7wn6hqigfymv7hd99ayf25dsqwnzx2";
+  version = "2.0.4";
+  sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 43153fa269086faf82c6100fc0da9482f6cf3c98 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 17:30:42 +0000
Subject: [PATCH 099/109] haskell-authenticate: updated to version 1.0.0.1

svn path=/nixpkgs/trunk/; revision=32702
---
 pkgs/development/libraries/haskell/authenticate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index 8818aa2d972..6aa1e449840 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.0.0";
-  sha256 = "0a163dhi69gh6zmi43jidxlaknbk1y0frjlwijdf7fp073rh0p87";
+  version = "1.0.0.1";
+  sha256 = "0wrbr7kwd4g8idd6i4ghvpd5q7nq0b8zx5qphqvkbs128m0r308d";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
     conduit httpConduit httpTypes network tagsoup text transformers

From 31dc88f597adae42186c3c74f4c52eb4fef91a97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 17:30:44 +0000
Subject: [PATCH 100/109] haskell-clientsession: updated to version 0.7.4.1

svn path=/nixpkgs/trunk/; revision=32703
---
 pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index a59b3b9ef0e..d4a770d34b7 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.4";
-  sha256 = "050mg3rzyld4v2b9v1pc1q563sp7sffiapvr8ks8f46ibl17lvss";
+  version = "0.7.4.1";
+  sha256 = "1fnrngbx86zcvh0ybv7ans132d216ayxdzlgw0x4qh0sw9r3w2ip";
   buildDepends = [
     base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy
     skein tagged

From 3c88baeec8fbe5e260f71203d719ee4405997d58 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 17:30:47 +0000
Subject: [PATCH 101/109] haskell-convertible: updated to version 1.0.11.1

svn path=/nixpkgs/trunk/; revision=32704
---
 pkgs/development/libraries/haskell/convertible/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/default.nix
index 5497500c0a8..a3fa0208e2d 100644
--- a/pkgs/development/libraries/haskell/convertible/default.nix
+++ b/pkgs/development/libraries/haskell/convertible/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "convertible";
-  version = "1.0.11.0";
-  sha256 = "0qkz760ddshmglmrf47a01978c9zhxfss44b6vmfkwwfcjb7da2b";
+  version = "1.0.11.1";
+  sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl text time ];

From 4fc8cd9777a5f203fe890c35f64d1055172d46ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 17:30:49 +0000
Subject: [PATCH 102/109] haskell-testpack: updated to version 2.1.2

svn path=/nixpkgs/trunk/; revision=32705
---
 pkgs/development/libraries/haskell/testpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/testpack/default.nix b/pkgs/development/libraries/haskell/testpack/default.nix
index 35b619166a4..bb729ef3120 100644
--- a/pkgs/development/libraries/haskell/testpack/default.nix
+++ b/pkgs/development/libraries/haskell/testpack/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "testpack";
-  version = "2.1.1";
-  sha256 = "1z8g3xhvy901h7kr7q4wcms5b23xniskrgxfpq42w4b34acwvhmg";
+  version = "2.1.2";
+  sha256 = "12dhl8svy0wmdwlvkp0p0j6wr6vgv4hrjcpdv48kc5rcwjvh8xif";
   buildDepends = [ HUnit mtl QuickCheck random ];
   meta = {
     homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";

From a631f6de6a6f3a6429d494081bfabd7c55019d05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 17:30:52 +0000
Subject: [PATCH 103/109] haskell-utility-ht: updated to version 0.0.8

svn path=/nixpkgs/trunk/; revision=32706
---
 pkgs/development/libraries/haskell/utility-ht/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix
index 6b79e4cdda8..9a90eb5dd9f 100644
--- a/pkgs/development/libraries/haskell/utility-ht/default.nix
+++ b/pkgs/development/libraries/haskell/utility-ht/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "utility-ht";
-  version = "0.0.7.1";
-  sha256 = "0k097kyv6rxjvg1drnphv2mg882xx2lk098hs557fcsr16w658ma";
+  version = "0.0.8";
+  sha256 = "02sm1xj5xa65hpkvl2yk89d9dlg3c2ap8qcviq9zj10asmsbzyd8";
   meta = {
     description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
     license = self.stdenv.lib.licenses.bsd3;

From 81e6c12bb3997db1c4f6dfebcfc1ac5c6f870fd0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 19:24:44 +0000
Subject: [PATCH 104/109] haskell-IfElse: added version 0.85

svn path=/nixpkgs/trunk/; revision=32707
---
 .../libraries/haskell/IfElse/default.nix        | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/IfElse/default.nix

diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix
new file mode 100644
index 00000000000..632de1f30e5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/IfElse/default.nix
@@ -0,0 +1,17 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "IfElse";
+  version = "0.85";
+  sha256 = "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa";
+  buildDepends = [ mtl ];
+  meta = {
+    description = "Anaphoric and miscellaneous useful control-flow";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 00217ee68ad..31d8ef454b8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -911,6 +911,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hxtUnicode = callPackage ../development/libraries/haskell/hxt-unicode {};
 
+  IfElse = callPackage ../development/libraries/haskell/IfElse {};
+
   ieee754 = callPackage ../development/libraries/haskell/ieee754 {};
 
   instantGenerics = callPackage ../development/libraries/haskell/instant-generics {};

From d18d66bd5fab748ef661f3be424fdd9cf1377924 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 19:24:47 +0000
Subject: [PATCH 105/109] haskell-filestore: updated to version 0.4.1

svn path=/nixpkgs/trunk/; revision=32708
---
 pkgs/development/libraries/haskell/filestore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index db441223843..0abd073c51c 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "filestore";
-  version = "0.4.0.4";
-  sha256 = "14rp2689gjnk9pqk2xv4m3q3icgfvbik32c2d6gx4l2y7n78dsbx";
+  version = "0.4.1";
+  sha256 = "02ki6b4rbmk463qmmqia7igkrsr7h1kxal94k6pikkikylx2f8r7";
   buildDepends = [ Diff filepath parsec split time utf8String xml ];
   meta = {
     homepage = "http://johnmacfarlane.net/repos/filestore";

From 49a9e3959349b11fb0887118e1ab5973b6d59e6b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 19:24:49 +0000
Subject: [PATCH 106/109] haskell-gitit: updated to version 0.9

svn path=/nixpkgs/trunk/; revision=32709
---
 .../libraries/haskell/gitit/default.nix       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 65aab04f914..b9fc9fa3ae9 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -1,21 +1,22 @@
-{ cabal, cgi, ConfigFile, feed, filepath, filestore, ghcPaths
-, happstackServer, happstackUtil, highlightingKate, hslogger
-, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes
-, parsec, random, recaptcha, safe, SHA, syb, text, time, url
-, utf8String, xhtml, xml, xssSanitize, zlib
+{ cabal, blazeHtml, cgi, ConfigFile, feed, filepath, filestore
+, ghcPaths, happstackServer, happstackUtil, highlightingKate
+, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc
+, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup
+, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "gitit";
-  version = "0.8.1";
-  sha256 = "1b5i6fm68vwhlvgz0m7xxzklkxc2c6lrqyqfqyjs93p5j0aqgvfn";
+  version = "0.9";
+  sha256 = "00kjfmczj5m3b8r8djdpad8d27s44z7pf76yyc0sdja1f3bd4mlp";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cgi ConfigFile feed filepath filestore ghcPaths happstackServer
-    happstackUtil highlightingKate hslogger HStringTemplate HTTP json
-    mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb
-    text time url utf8String xhtml xml xssSanitize zlib
+    blazeHtml cgi ConfigFile feed filepath filestore ghcPaths
+    happstackServer happstackUtil highlightingKate hslogger
+    HStringTemplate HTTP json mtl network pandoc pandocTypes parsec
+    random recaptcha safe SHA syb tagsoup text time url utf8String
+    xhtml xml xssSanitize zlib
   ];
   meta = {
     homepage = "http://gitit.net";

From 41b3f46f788ee4caef2334c5f94924ae9bdeaa06 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 20:38:33 +0000
Subject: [PATCH 107/109] haskell-yesod: updated to version 0.10.1.1

svn path=/nixpkgs/trunk/; revision=32710
---
 pkgs/development/libraries/haskell/yesod/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 435aa7492bb..2ab9b568313 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod";
-  version = "0.10.1";
-  sha256 = "1m4prrpxdcj7qn755as37kn66f7didparhar520anr9cryn0wfr9";
+  version = "0.10.1.1";
+  sha256 = "1d64kx0jfk1d1r4k8r57y5wz84pjxs481qdnzgjfv279y467fki6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 57b612cb050778c4ded12fe8e45de26b91eeef70 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Feb 2012 22:50:33 +0000
Subject: [PATCH 108/109] vpnc: added patch to fix the 'Error: either "to" is
 duplicate, or "ipid" is a garbage' bug

Further details are at:

  http://www.rz.uni-konstanz.de/activekb/questions/250/VPNC+unter+Ubuntu+11.10+%22Error%3A+either+%22to%22+is+duplicate%2C+or+%22ipid%22+is+a+garbage.%22

svn path=/nixpkgs/trunk/; revision=32712
---
 pkgs/tools/networking/vpnc/default.nix       |  2 +-
 pkgs/tools/networking/vpnc/vpnc-script.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/vpnc/vpnc-script.patch

diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 88ef6bd8e59..8619cd95409 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6";
   };
 
-  patches = [ ./makefile.patch ];
+  patches = [ ./makefile.patch ./vpnc-script.patch ];
 
   # The `etc/vpnc/vpnc-script' script relies on `which' and on
   # `ifconfig' as found in net-tools (not GNU Inetutils).
diff --git a/pkgs/tools/networking/vpnc/vpnc-script.patch b/pkgs/tools/networking/vpnc/vpnc-script.patch
new file mode 100644
index 00000000000..67a86d5d58f
--- /dev/null
+++ b/pkgs/tools/networking/vpnc/vpnc-script.patch
@@ -0,0 +1,12 @@
+diff -ubr vpnc-0.5.3-orig/vpnc-script.in vpnc-0.5.3/vpnc-script.in
+--- vpnc-0.5.3-orig/vpnc-script.in	2012-02-29 23:03:35.289636602 +0100
++++ vpnc-0.5.3/vpnc-script.in	2012-02-29 23:03:59.597307445 +0100
+@@ -116,7 +116,7 @@
+ 
+ if [ -n "$IPROUTE" ]; then
+ 	fix_ip_get_output () {
+-		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g'
++		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g'
+ 	}
+ 
+ 	set_vpngateway_route() {

From a75ccf7dca60c2a6a81c3dc8ac9e84f4143f87ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Mar 2012 14:45:27 +0000
Subject: [PATCH 109/109] * Don't set the nscd restart action here.

svn path=/nixpkgs/trunk/; revision=32717
---
 pkgs/tools/networking/openresolv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index b2831fd4d7b..3aa818db728 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       LIBEXECDIR=$out/libexec/resolvconf
       VARDIR=/var/run/resolvconf
       MANDIR=$out/share/man
-      RESTARTCMD="initctl restart \1"
+      RESTARTCMD="false \1"
       EOF
     '';