From c5750ea3e9b5bb0f746f3a78d9d4ebdeb26f28ef Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Wed, 6 Feb 2013 13:24:57 +0100
Subject: [PATCH 01/37] Add jzmq package.

---
 .../libraries/java/jzmq/default.nix           | 24 +++++++++++++++++++
 pkgs/lib/maintainers.nix                      |  1 +
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/java/jzmq/default.nix

diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
new file mode 100644
index 00000000000..9130e02e1d7
--- /dev/null
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, zeromq2, jdk}:
+
+stdenv.mkDerivation rec {
+  name = "jzmq-2.1.0";
+
+  src = fetchgit {
+    url = git://github.com/zeromq/jzmq.git;
+    rev = "946fd39780423b2df6e5efd9fa2cd863fd79c9db";
+  };
+
+  buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ];
+
+  preConfigurePhases = ["./autogen.sh"];
+  preConfigure = if stdenv.system == "x86_64-darwin" then ''
+    sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
+  '' else "";
+
+
+  maintainers = [ stdenv.lib.maintainers.blue ];
+  meta = {
+    homepage = "http://www.zeromq.org";
+    description = "Java bindings for ZeroMQ";
+  };
+}
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 78c77f61f4e..fa1cbe94799 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -17,6 +17,7 @@
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   bodil = "Bodil Stokke <nix@bodil.org>";
+  blue = "Danny Wilson <danny@prime.vc>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0d79b1aefa..884caf161d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5736,6 +5736,8 @@ let
 
   junit = callPackage ../development/libraries/java/junit { };
 
+  jzmq = callPackage ../development/libraries/java/jzmq { };
+
   lucene = callPackage ../development/libraries/java/lucene { };
 
   mockobjects = callPackage ../development/libraries/java/mockobjects { };

From 04a232f28b1f22b01da157f8d09e2f56fafa1cbc Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Thu, 7 Feb 2013 15:32:10 +0100
Subject: [PATCH 02/37] Add storm package.

---
 pkgs/servers/computing/storm/default.nix | 35 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/computing/storm/default.nix

diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
new file mode 100644
index 00000000000..083ad5e6439
--- /dev/null
+++ b/pkgs/servers/computing/storm/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python}:
+
+stdenv.mkDerivation {
+  name = "storm-0.8.2";
+  src = fetchurl {
+    url = https://dl.dropbox.com/u/133901206/storm-0.8.2.zip;
+    sha256 = "8761aea0b54e5bab4a68b259bbe6b5b2f8226204488b5559eba57a0c458b2bbc";
+  };
+
+  buildInputs = [ unzip jzmq ];
+
+  installPhase = ''
+    # Remove junk
+    rm -f lib/jzmq*
+    mkdir -p /var/log/storm
+    mv bin/storm $out/bin/
+    rm -R bin
+
+    # Fix shebang header for python scripts
+    sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" bin/storm;
+
+    mkdir -p $out
+    cp -av * $out
+    ln -s /var/log/storm $out/logs
+  '';
+
+  dontStrip = true;
+
+  meta = {
+    homepage = "http://storm-project.net";
+    description = "Storm, free and open source distributed realtime computation system.";
+    license = "Eclipse Public License 1.0";
+    maintainers = [ lib.maintainers.blue ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 884caf161d9..2710098375a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6170,6 +6170,8 @@ let
 
   thttpd = callPackage ../servers/http/thttpd { };
 
+  storm = callPackage ../servers/computing/storm { };
+
   tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 
   tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };

From d6a812332ce42f34a39618d36cc85b96d5e70d08 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Fri, 8 Feb 2013 15:19:33 +0100
Subject: [PATCH 03/37] Make Storm conf and log path configurable via symlinks.
   - The bin/storm script makes too many assumptions about file locations and
 java classpath that I couldn't figure out a better way.

Fix jzmq build on NixOS: java source was treated as ASCII.
---
 pkgs/development/libraries/java/jzmq/default.nix |  9 ++++++---
 pkgs/servers/computing/storm/default.nix         | 12 +++++++-----
 pkgs/top-level/all-packages.nix                  |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index 9130e02e1d7..6208090ad51 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -11,9 +11,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ];
 
   preConfigurePhases = ["./autogen.sh"];
-  preConfigure = if stdenv.system == "x86_64-darwin" then ''
-    sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
-  '' else "";
+  preConfigure = ''
+    sed -i -e 's|(JAVAC)|(JAVAC) -encoding utf8|' src/Makefile.in
+    ${if stdenv.system == "x86_64-darwin" then
+      '' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
+      '' else ""}
+  '';
 
 
   maintainers = [ stdenv.lib.maintainers.blue ];
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 083ad5e6439..b60d9fe62b2 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python}:
+{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python, logsDir, confDir }:
 
 stdenv.mkDerivation {
   name = "storm-0.8.2";
@@ -12,16 +12,18 @@ stdenv.mkDerivation {
   installPhase = ''
     # Remove junk
     rm -f lib/jzmq*
-    mkdir -p /var/log/storm
+    mkdir -p $out/bin
     mv bin/storm $out/bin/
-    rm -R bin
+    rm -R bin conf logs
 
     # Fix shebang header for python scripts
-    sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" bin/storm;
+    sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" $out/bin/storm;
 
     mkdir -p $out
     cp -av * $out
-    ln -s /var/log/storm $out/logs
+    cd $out;
+    ${if logsDir != "" then ''ln -s ${logsDir} logs'' else ""}
+    ${if confDir != "" then ''ln -s ${confDir} conf'' else ""}
   '';
 
   dontStrip = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2710098375a..09c498a14bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6170,7 +6170,7 @@ let
 
   thttpd = callPackage ../servers/http/thttpd { };
 
-  storm = callPackage ../servers/computing/storm { };
+  storm = callPackage ../servers/computing/storm { confDir = "/etc/storm"; logsDir = "/var/log"; };
 
   tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 

From c4b1bbc1c8f75a3378c32385c2c25c86300a1db8 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Thu, 14 Feb 2013 09:58:49 +0100
Subject: [PATCH 04/37] Improved Storm package.

- Add config to defaults.yaml, to allow topologies to include their own storm.yaml.
- Symlink extra jars in lib/ since it's nearly impossible to add a classpath to Storm's config.
- Include native jzmq library in java.library.path
- Use package default args.
---
 pkgs/servers/computing/storm/default.nix | 22 +++++++++++++++++-----
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index b60d9fe62b2..2b7efff5210 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python, logsDir, confDir }:
+{ stdenv, fetchurl, zip, unzip, jzmq, jdk, lib, python, logsDir ? "", confFile ? "", extraLibraryPaths ? [], extraJars ? [] }:
 
 stdenv.mkDerivation {
   name = "storm-0.8.2";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "8761aea0b54e5bab4a68b259bbe6b5b2f8226204488b5559eba57a0c458b2bbc";
   };
 
-  buildInputs = [ unzip jzmq ];
+  buildInputs = [ zip unzip jzmq ];
 
   installPhase = ''
     # Remove junk
@@ -19,11 +19,23 @@ stdenv.mkDerivation {
     # Fix shebang header for python scripts
     sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" $out/bin/storm;
 
-    mkdir -p $out
+    mkdir -p $out/conf
     cp -av * $out
+    
     cd $out;
-    ${if logsDir != "" then ''ln -s ${logsDir} logs'' else ""}
-    ${if confDir != "" then ''ln -s ${confDir} conf'' else ""}
+    ${if logsDir  != "" then ''ln -s ${logsDir} logs'' else ""}
+    
+    # Extract, delete from zip; and optionally append to defaults.yaml
+    unzip  storm-*.jar defaults.yaml;
+    zip -d storm-*.jar defaults.yaml;
+    echo 'java.library.path: "${jzmq}/lib:${lib.concatStringsSep ":" extraLibraryPaths}"' >> defaults.yaml;
+    ${if confFile != "" then ''cat ${confFile} >> defaults.yaml'' else ""}
+    mv defaults.yaml conf;
+
+    # Link to jzmq jar and extra jars
+    cd lib;
+    ln ${jzmq}/share/java/*.jar;
+    ${lib.concatMapStrings (jar: "ln -s ${jar};\n") extraJars}
   '';
 
   dontStrip = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09c498a14bd..2710098375a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6170,7 +6170,7 @@ let
 
   thttpd = callPackage ../servers/http/thttpd { };
 
-  storm = callPackage ../servers/computing/storm { confDir = "/etc/storm"; logsDir = "/var/log"; };
+  storm = callPackage ../servers/computing/storm { };
 
   tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { };
 

From 83c734cf38fcfd0583bce6ab6dbc6e67d5a12674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 2 Sep 2013 17:14:49 +0200
Subject: [PATCH 05/37] ghostscript: maintenance update

---
 pkgs/misc/ghostscript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 64cd8b9f6ac..ba136530593 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -41,10 +41,10 @@ let
   };
 
   mainlineSrc = rec {
-    name = "ghostscript-9.09";
+    name = "ghostscript-9.10";
     src = fetchurl {
       url = "http://downloads.ghostscript.com/public/${name}.tar.bz2";
-      sha256 = "1xwn4zlfb9jz0vrda0vd42qwfqddiav7rdkga0q94jc2q1qddzx6";
+      sha256 = "106mglk77dhdra1m0ddnmaq645xj1aj45qvlh8izv3xx4cdrv3bc";
     };
     meta = meta_common // {
       homepage = "http://www.ghostscript.com/";

From 2ff0b8dc149cb8ffbf14a1a05f0c85ae8d071b3f Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Mon, 2 Sep 2013 18:48:29 +0200
Subject: [PATCH 06/37] I henceforth will maintain as my Github username.

---
 pkgs/lib/maintainers.nix                 | 2 +-
 pkgs/servers/computing/storm/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index fa1cbe94799..1b7d8a8e222 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -17,7 +17,6 @@
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   bodil = "Bodil Stokke <nix@bodil.org>";
-  blue = "Danny Wilson <danny@prime.vc>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
@@ -54,6 +53,7 @@
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
+  vizanto = "Danny Wilson <danny@prime.vc>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
 }
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 2b7efff5210..4fddeef643f 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation {
     homepage = "http://storm-project.net";
     description = "Storm, free and open source distributed realtime computation system.";
     license = "Eclipse Public License 1.0";
-    maintainers = [ lib.maintainers.blue ];
+    maintainers = [ lib.maintainers.vizanto ];
   };
 }

From 3f3a7e9e435b735804cb5bf0a6842ce28f440fe5 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@onlinetouch.nl>
Date: Mon, 2 Sep 2013 18:50:49 +0200
Subject: [PATCH 07/37] Yes.

---
 pkgs/development/libraries/java/jzmq/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix
index 6208090ad51..508b188aef7 100644
--- a/pkgs/development/libraries/java/jzmq/default.nix
+++ b/pkgs/development/libraries/java/jzmq/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
 
-  maintainers = [ stdenv.lib.maintainers.blue ];
+  maintainers = [ stdenv.lib.maintainers.vizanto ];
   meta = {
     homepage = "http://www.zeromq.org";
     description = "Java bindings for ZeroMQ";

From 1fb3110b84f5c016c87ae91e5d129bc688d77d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 3 Sep 2013 22:08:59 +0200
Subject: [PATCH 08/37] libffi: produce portable library, enable doCheck

Thanks to #907.
---
 pkgs/development/libraries/libffi/default.nix | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 27c3e9f66f3..f8ca40168ef 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, dejagnu }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "libffi-3.0.13";
 
   src = fetchurl {
@@ -8,15 +8,21 @@ stdenv.mkDerivation (rec {
     sha256 = "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x";
   };
 
+  buildInputs = stdenv.lib.optional doCheck dejagnu;
+
+  configureFlags = [ "--with-gcc-arch=generic" ]; # no detection of -march= or -mtune=
+
   doCheck = true;
 
+  dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
+
   postInstall =
     # Install headers in the right place.
-    '' ln -sv "$out/lib/"libffi*/include "$out/include"
+    '' ln -srv "$out/lib/"libffi*/include "$out/include"
     '';
 
   meta = {
-    description = "libffi, a foreign function call interface library";
+    description = "A foreign function call interface library";
 
     longDescription = ''
       The libffi library provides a portable, high level programming
@@ -33,7 +39,7 @@ stdenv.mkDerivation (rec {
       conversions for values passed between the two languages.
     '';
 
-    homepage = http://sources.redhat.com/libffi/;
+    homepage = http://sourceware.org/libffi/;
 
     # See http://github.com/atgreen/libffi/blob/master/LICENSE .
     license = "free, non-copyleft";
@@ -43,9 +49,3 @@ stdenv.mkDerivation (rec {
   };
 }
 
-//
-
-# Don't run the native `strip' when cross-compiling.
-(if (stdenv ? cross)
- then { dontStrip = true; }
- else { }))

From 590cee5d19b8e084f373ec420d86ec8b6e34d07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 3 Sep 2013 23:57:51 +0200
Subject: [PATCH 09/37] expect: "minor" update, no longer depends on X/Tk

ANN: https://groups.google.com/forum/#!topic/comp.lang.tcl/lwZjtKOfaLE
I hope this solves a darwin -lXss linkage problem.
(broke most X stuff through dejagnu -> libffi -> llvm or mesa)
---
 pkgs/tools/misc/expect/default.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index d9f9b09271b..ad348f1ed0f 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -1,14 +1,16 @@
-{stdenv, fetchurl, tcl, tk, xproto, libX11}:
+{ stdenv, fetchurl, tcl }:
 
+let version = "5.45";
+in
 stdenv.mkDerivation {
-  name = "expect-5.44.1";
+  name = "expect-${version}";
 
   src = fetchurl {
-    url = http://expect.nist.gov/old/expect-5.44.1.tar.gz;
-    sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4";
+    url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz";
+    sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj";
   };
 
-  buildInputs = [tcl tk xproto libX11];
+  buildInputs = [ tcl ];
 
   #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H";
 
@@ -23,14 +25,16 @@ stdenv.mkDerivation {
     export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
   '';
 
-  configureFlags = ["--with-tcl=${tcl}/lib"
+  configureFlags = [
+    "--with-tcl=${tcl}/lib"
     "--with-tclinclude=${tcl}/include"
-    "--with-tk=${tk}/lib"
-    "--exec-prefix=$out"];
+    "--exec-prefix=$out"
+  ];
+
+  postInstall="cp expect $out/bin; mkdir -p $out/lib; cp *.so $out/lib";
 
   meta = {
     description = "A tool for automating interactive applications";
     homepage = http://expect.nist.gov/;
   };
-  postInstall="cp expect{,k} $out/bin; mkdir -p $out/lib; cp *.so $out/lib";
 }

From 90575ababbd6f38dd9d40a449dcec038cbbd8ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 4 Sep 2013 10:15:32 +0200
Subject: [PATCH 10/37] expect: fix postInstall library suffix on darwin

---
 pkgs/tools/misc/expect/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index ad348f1ed0f..885fd040e47 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation {
     "--exec-prefix=$out"
   ];
 
-  postInstall="cp expect $out/bin; mkdir -p $out/lib; cp *.so $out/lib";
+  postInstall = let libSuff = if stdenv.isDarwin then "dylib" else "so";
+    in "cp expect $out/bin; mkdir -p $out/lib; cp *.${libSuff} $out/lib";
 
   meta = {
     description = "A tool for automating interactive applications";

From e12c5deabe155a707c2fe7cea734f62868f40897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 4 Sep 2013 15:51:49 +0200
Subject: [PATCH 11/37] libffi: disable doCheck on darwin until we fix dejagnu
 build

---
 pkgs/development/libraries/libffi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index f8ca40168ef..807fe54c27e 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gcc-arch=generic" ]; # no detection of -march= or -mtune=
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin; # until we solve dejagnu problems on darwin
 
   dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
 

From 0cf8a74e82f25cc6f5b94f50358f1bfbfb379e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 6 Sep 2013 15:51:38 +0200
Subject: [PATCH 12/37] dbus: minor update, style refactoring, parallel build

---
 pkgs/development/libraries/dbus/default.nix | 58 ++++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index d50a0076e62..fe4be4f3726 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -3,8 +3,8 @@
 , libX11, libICE, libSM, useX11 ? stdenv.isLinux }:
 
 let
-  version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8
-  sha256 = "14pfh2ksn4srfry752kf1jy3c61hklcs9fx2xglw2ifhsszplypn";
+  version = "1.6.14"; # 1.7.* isn't recommended, even for gnome 3.8
+  sha256 = "0v7mcxwfmpjf7vndnvf2kf02al61clrxs36bqii20s0lawfh2xjn";
 
   inherit (stdenv) lib;
 
@@ -25,30 +25,13 @@ let
       inherit sha256;
     };
 
-    configureFlags = [
-      "--localstatedir=/var"
-      "--sysconfdir=/etc"
-      "--with-session-socket-dir=/tmp"
-      "--with-systemdsystemunitdir=$(out)/lib/systemd"
-    ];
-
-    preConfigure = ''
-      patchShebangs .
-      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
-      autoreconf -fi
-    '';
-
-    installFlags = "sysconfdir=$(out)/etc";
-
-    doCheck = true;
-
-    patches = [ ./ignore-missing-includedirs.patch ]
-      ++ lib.optional (stdenv.isSunOS || stdenv.isLinux/*avoid rebuilds*/) ./implement-getgrouplist.patch
-      ++ [ ./ucred-dirty-hack.patch ./no-create-dirs.patch ];
-
-    nativeBuildInputs = [ pkgconfig ];
-    propagatedBuildInputs = [ expat ];
-    buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
+    patches = [
+        ./ignore-missing-includedirs.patch
+        ./ucred-dirty-hack.patch
+        ./no-create-dirs.patch
+      ]
+      ++ lib.optional (stdenv.isSunOS || stdenv.isLinux) ./implement-getgrouplist.patch
+      ;
 
     # build only the specified subdirs
     postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n"
@@ -59,6 +42,29 @@ let
           done
         '';
 
+    nativeBuildInputs = [ pkgconfig ];
+    propagatedBuildInputs = [ expat ];
+    buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
+
+    preConfigure = ''
+      patchShebangs .
+      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
+      autoreconf -fi
+    '';
+
+    configureFlags = [
+      "--localstatedir=/var"
+      "--sysconfdir=/etc"
+      "--with-session-socket-dir=/tmp"
+      "--with-systemdsystemunitdir=$(out)/lib/systemd"
+    ];
+
+    enableParallelBuilding = true;
+
+    doCheck = true;
+
+    installFlags = "sysconfdir=$(out)/etc";
+
   } merge ]);
 
   libs = dbus_drv "libs" "dbus" ({

From 9766dbb1dff94d2ad8f2c613ac78d278f44c6268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 7 Sep 2013 07:55:55 +0200
Subject: [PATCH 13/37] dejagnu: minor update

---
 pkgs/development/tools/misc/dejagnu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 06c1d4fe76b..beed6032393 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dejagnu-1.5";
+  name = "dejagnu-1.5.1";
 
   src = fetchurl {
     url = "mirror://gnu/dejagnu/${name}.tar.gz";
-    sha256 = "1nx3x3h96a82q92q108q71giv2nz9xmbbn2nrlr3wvvs6l45id68";
+    sha256 = "1lik8h4qi7x0mhsi8xmj91an1yb63rjbk6v4xrmzgiy5lk8lgrv0";
   };
 
   patches = [ ./wrapped-runtest-program-name.patch ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/runtest" \
-		--prefix PATH ":" "${expect}/bin"
+      --prefix PATH ":" "${expect}/bin"
   '';
 
   meta = {

From 1d931d049b75c66f2b8ffc2a9c1d336967a5eeaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 7 Sep 2013 23:36:21 +0200
Subject: [PATCH 14/37] libwnck: update

News claim it's important for Xfce-4.10, which still builds.
---
 .../development/libraries/libwnck/default.nix | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
index d2855afc43e..6a4479bdda3 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/pkgs/development/libraries/libwnck/default.nix
@@ -1,14 +1,24 @@
-{stdenv, fetchurl, pkgconfig, libX11, gtk, intltool}:
+{ stdenv, fetchurl, pkgconfig, gtk, intltool, xorg }:
 
-stdenv.mkDerivation {
-  name = "libwnck-2.30.7";
+let
+  ver_maj = "2.31";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "libwnck-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libwnck/2.30/libwnck-2.30.7.tar.xz;
-    sha256 = "15713yl0f8f3p99jzqqfmbicrdswd3vwpx7r3bkf1bgh6d9lvs4b";
+    url = "mirror://gnome/sources/libwnck/${ver_maj}/${name}.tar.xz";
+    sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
   };
 
-  buildInputs = [ pkgconfig libX11 gtk intltool ];
+  buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ];
+  # ?another optional: startup-notification
 
   configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
+
+  meta = {
+    description = "A library for creating task lists and pagers";
+    license = stdenv.lib.licenses.lgpl21;
+  };
 }

From 9f6d539707fb42d0d470bd8ca674aae5e65118b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:23:00 +0200
Subject: [PATCH 15/37] cabal-install-1.18.0.1: this package requires Cabal
 1.18.x to compile

---
 pkgs/top-level/haskell-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ca723691828..bd7a9f2e828 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2396,7 +2396,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
-  cabalInstall_1_18_0_1 = callPackage ../tools/package-management/cabal-install/1.18.0.1.nix {};
+  cabalInstall_1_18_0_1 = callPackage ../tools/package-management/cabal-install/1.18.0.1.nix {
+    Cabal = self.Cabal_1_18_0;
+  };
   cabalInstall = self.cabalInstall_1_18_0;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};

From 2282809b350e25b90e35190d85b2cb5097b282ef Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:52:31 +0200
Subject: [PATCH 16/37] libnetfilter_queue: add version 1.0.2

---
 .../libraries/libnetfilter_queue/default.nix  | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/libnetfilter_queue/default.nix

diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
new file mode 100644
index 00000000000..a1d2b3b8e24
--- /dev/null
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }:
+
+stdenv.mkDerivation rec {
+  name = "libnetfilter_queue-1.0.2";
+
+  src = fetchurl {
+    url = "ftp://ftp.netfilter.org/pub/libnetfilter_queue/${name}.tar.bz2";
+    sha256 = "0chsmj9ky80068vn458ijz9sh4sk5yc08dw2d6b8yddybpmr1143";
+  };
+
+  buildInputs = [ pkgconfig libmnl libnfnetlink ];
+
+  meta = {
+    homepage = "http://www.netfilter.org/projects/libnetfilter_queue/";
+    description = "userspace API to packets queued by the kernel packet filter";
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39bedd990d3..0c779ae07bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4812,6 +4812,8 @@ let
 
   libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
 
+  libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { };
+
   libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
 
   libnih = callPackage ../development/libraries/libnih { };

From 0c5cf00829d3e3414df3069c689ddaf27fc16c4a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:56:22 +0200
Subject: [PATCH 17/37] tcpcrypt: add current HEAD of the Github master branch

---
 pkgs/tools/security/tcpcrypt/default.nix | 28 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/security/tcpcrypt/default.nix

diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix
new file mode 100644
index 00000000000..3026ed66d72
--- /dev/null
+++ b/pkgs/tools/security/tcpcrypt/default.nix
@@ -0,0 +1,28 @@
+{ fetchurl, stdenv
+, openssl, libcap, libnfnetlink, libnetfilter_queue
+}:
+
+let
+  rev = "0e07772316061ad67b8770e7d98d5dd099c9c7c7";
+in
+stdenv.mkDerivation rec {
+  name = "tcpcrypt-2011.07.22";
+
+  src = fetchurl {
+    url = "https://github.com/sorbo/tcpcrypt/archive/${rev}.tar.gz";
+    sha256 = "1f1f1iawlvipnccwh31fxnb8yam1fgh36m0qcbc29qk1ggwrfnkk";
+    name = "${name}.tar.gz";
+  };
+
+  buildInputs = [ openssl libcap libnfnetlink libnetfilter_queue ];
+
+  preConfigure = "cd user";
+
+  meta = {
+    homepage = "http://tcpcrypt.org/";
+    description = "enable opportunistic encryption of all TCP traffic";
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c779ae07bd..4f36ba63f07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1794,6 +1794,8 @@ let
 
   tarsnap = callPackage ../tools/backup/tarsnap { };
 
+  tcpcrypt = callPackage ../tools/security/tcpcrypt { };
+
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };

From 3a8adb70143e77cca58b3bd934fab34be4a7b001 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 9 Sep 2013 13:03:39 +0200
Subject: [PATCH 18/37] Update nixops to 1.1

---
 pkgs/tools/package-management/nixops/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 7f2b533383e..3381e3644fe 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,12 +1,12 @@
-{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }:
+{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.0.1";
+  name = "nixops-1.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2";
-    sha256 = "c6dda2597ba0ab2f60c984d4715163c02940f20803619668d6c16eba8570a394";
+    sha256 = "1i0v4v83s663izw6al63avhs0378rp3nxchy8nkb1zam5rj097z2";
   };
 
   buildInputs = [ libxslt ];
@@ -15,6 +15,7 @@ pythonPackages.buildPythonPackage rec {
     [ pythonPackages.prettytable
       pythonPackages.boto
       pythonPackages.sqlite3
+      pythonPackages.hetzner
     ];
 
   doCheck = false;
@@ -29,6 +30,10 @@ pythonPackages.buildPythonPackage rec {
 
       mkdir -p $out/share/nix/nixops
       cp -av nix/* $out/share/nix/nixops
+
+      # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
+      # the version of openssh is causing errors when have big networks (40+)
+      wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
     '';
 
   meta = {

From eac934c83affc067d46e0f9c6640210ebead1df4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 9 Sep 2013 13:05:50 +0200
Subject: [PATCH 19/37] Fix collectd, couldn't run due to missing
 pthread_cancel.

---
 pkgs/tools/system/collectd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 7da45c596ef..37283fc18a4 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0gljf5c60q6i0nrii6addxy1p76qqixww8zy17a7a1zil6a3i5wh";
   };
 
+  NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel
+
   meta = {
     homepage = http://collectd.org;
     description = "collectd is a daemon which collects system performance statistics periodically";

From 0e7783c608b52a57712902c46f8aca9a72271bfc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:10:28 +0200
Subject: [PATCH 20/37] haskell-exceptions: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/exceptions/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix
index ad940556ec5..a15c2cc1e48 100644
--- a/pkgs/development/libraries/haskell/exceptions/default.nix
+++ b/pkgs/development/libraries/haskell/exceptions/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/ekmett/exceptions/";
     description = "Extensible optionally-pure exceptions";
@@ -17,5 +18,4 @@ cabal.mkDerivation (self: {
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
-  doCheck = false; # https://github.com/ekmett/exceptions/issues/18
 })

From 28c5958658dadbd49b2570e7265756dad4cdd7c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:06 +0200
Subject: [PATCH 21/37] haskell-thyme: disable the test suite some more

---
 pkgs/development/libraries/haskell/thyme/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index dde2b0942f5..60999f51898 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
     attoparsec Cabal filepath lens QuickCheck random
     systemPosixRedirect text time vectorSpace
   ];
-  check = false;
+  doCheck = false;
   meta = {
     homepage = "https://github.com/liyang/thyme";
     description = "A faster time library";

From 09477f6002f0e2cfa0f34f0cf0efb45ccecbe059 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:14 +0200
Subject: [PATCH 22/37] haskell-HaRe: update to version 0.7.0.2

---
 pkgs/development/tools/haskell/HaRe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index cb0ad759d55..efdc65c389e 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.7.0.1";
-  sha256 = "1ykbyc6p71k6rs85vcsjgk47cxd2lda3iw78jzs0fx43qr1dywnl";
+  version = "0.7.0.2";
+  sha256 = "05dlrx4wfadv798098bclkmsmm6f226n9rqp19ajdwaa11x5mf8d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 7e8b474485e377ef56507d93ade804b8e1facb97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 23/37] haskell-digestive-functors-heist: update to version
 0.8.0.0

---
 .../libraries/haskell/digestive-functors-heist/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
index 460154c70f0..3773192a5dc 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-heist";
-  version = "0.7.0.0";
-  sha256 = "0ljsr4yy3pb4cjg9dcgfcs9rn1ihg3xi9ak5p3h3kw3w19d1hsaq";
+  version = "0.8.0.0";
+  sha256 = "1zy2fy30q51q8pqw78f8gxc1x52vw49w3mnqc2hfqw190v5r9dgh";
   buildDepends = [
     blazeBuilder digestiveFunctors heist mtl text xmlhtml
   ];

From bca133d225ec241185ba4cab611771a0275ae31a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 24/37] haskell-dimensional: update to version 0.12.1.1

---
 pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix
index 154b7ea0628..1f672c25cfa 100644
--- a/pkgs/development/libraries/haskell/dimensional/default.nix
+++ b/pkgs/development/libraries/haskell/dimensional/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dimensional";
-  version = "0.12.1";
-  sha256 = "176mvnd570xskjs6ky1wax9adzzrm9j6ai0fc4hy2z4097ydcgwm";
+  version = "0.12.1.1";
+  sha256 = "1fjkvyp62bh5gyzhkn189z5mxrr1acwmk39mqxk4579xbchvpyq6";
   buildDepends = [ numtype time ];
   meta = {
     homepage = "http://dimensional.googlecode.com/";

From 32d609654ce25e6b0985afa7f0ac30ae1109b5ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 25/37] haskell-free: update to version 3.4.2

---
 pkgs/development/libraries/haskell/free/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index 385700ca863..56bf80d71af 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -1,14 +1,15 @@
 { cabal, bifunctors, comonad, comonadsFd, comonadTransformers
-, distributive, mtl, semigroupoids, semigroups, transformers
+, distributive, mtl, profunctors, semigroupoids, semigroups
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "3.4.1";
-  sha256 = "09yfkmnmhwwq22fsm1f4li4h13c3bqnh274z8jpgw0hrcnssh0rk";
+  version = "3.4.2";
+  sha256 = "1x6pdkcxk6z9ndph2yzz5n21afc2330m0ryv4w67jsss5aa69fwb";
   buildDepends = [
     bifunctors comonad comonadsFd comonadTransformers distributive mtl
-    semigroupoids semigroups transformers
+    profunctors semigroupoids semigroups transformers
   ];
   meta = {
     homepage = "http://github.com/ekmett/free/";

From 563786deffa33c56f17b341b9d57bd9518709a99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 26/37] haskell-unix-bytestring: update to version 0.3.7

---
 .../development/libraries/haskell/unix-bytestring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
index 49022b12a29..174fc925aae 100644
--- a/pkgs/development/libraries/haskell/unix-bytestring/default.nix
+++ b/pkgs/development/libraries/haskell/unix-bytestring/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-bytestring";
-  version = "0.3.6";
-  sha256 = "0m2ndw6r88vb4cqdkd8jg8dlk9h99mp3rand5j1gxxdjfv7q63ap";
+  version = "0.3.7";
+  sha256 = "1qwgs2bwga057csfa8izq0kc5vwi2vcaz2snlcgp0h9vql3qmvrg";
   meta = {
     homepage = "http://code.haskell.org/~wren/";
     description = "Unix/Posix-specific functions for ByteStrings";

From 66f905c14ef832b0406e97acef578a2375999757 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:11:19 +0200
Subject: [PATCH 27/37] haskell-yesod-platform: update to version 1.2.4.2

---
 .../libraries/haskell/yesod-platform/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix
index 5831bfe1df6..9fe24ca4a74 100644
--- a/pkgs/development/libraries/haskell/yesod-platform/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix
@@ -21,8 +21,8 @@
 , shakespeareText, silently, simpleSendfile, skein, socks
 , stringsearch, systemFileio, systemFilepath, tagged, tagsoup
 , tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat
-, unorderedContainers, utf8Light, utf8String, vault, vector, void
-, wai, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8
+, unorderedContainers, utf8Light, utf8String, vector, void, wai
+, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8
 , xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth
 , yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic
 , yesodTest, zlibBindings, zlibConduit
@@ -30,8 +30,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-platform";
-  version = "1.2.4.1";
-  sha256 = "13fw1svs3769m8rf5mnks0ibgdd73s1qq9dgg4h49xkzrdgs31rk";
+  version = "1.2.4.2";
+  sha256 = "1hmzdwjqi3cxdmyvcr48kprrsa8h548z272mif07114d0qh48x4w";
   buildDepends = [
     aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
     authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
@@ -53,7 +53,7 @@ cabal.mkDerivation (self: {
     shakespeareJs shakespeareText silently simpleSendfile skein socks
     stringsearch systemFileio systemFilepath tagged tagsoup
     tagstreamConduit tls tlsExtra transformersBase unixCompat
-    unorderedContainers utf8Light utf8String vault vector void wai
+    unorderedContainers utf8Light utf8String vector void wai
     waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit
     xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm
     yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings

From aeefa7b0700791bfb56bcd34b17282973200ab9f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 9 Sep 2013 12:59:26 +0200
Subject: [PATCH 28/37] Cabal-1.18.0: this version won't build without deepseq
 1.3 or later

---
 pkgs/top-level/haskell-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bd7a9f2e828..135e1b5660e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -653,7 +653,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
-  Cabal_1_18_0 = callPackage ../development/libraries/haskell/Cabal/1.18.0.nix { cabal = self.cabal.override { Cabal = null; }; };
+  Cabal_1_18_0 = callPackage ../development/libraries/haskell/Cabal/1.18.0.nix {
+    cabal = self.cabal.override { Cabal = null; };
+    deepseq = self.deepseq_1_3_0_1;
+  };
   Cabal = null; # core package in GHC
 
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};

From ea8a7bcd0c2ddec1463a9a4eb5edf976a342d92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 10 Sep 2013 10:42:33 +0200
Subject: [PATCH 29/37] libav: update 9.8 -> 9.9

It's supposed to include some security-related fixes.
---
 pkgs/development/libraries/libav/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index ce305a2880b..ea45902b749 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,7 +26,7 @@ with { inherit (stdenv.lib) optional optionals; };
 
 let
   result = {
-    libav_9   = libavFun   "9.8" "0r7hg9wg3cxjsmwzpa6f2p1a092g2iazyjjy23604ccskzbnirg3";
+    libav_9   = libavFun   "9.9" "1rwphyqb2c4zyp20y4ywxjiddmd46vd4dbpdm1lxqm3q63rmmdk9";
     libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79";
   };
 

From 1628c03c4e834b4f3e1ac2696d2ebfcad1b719c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 10 Sep 2013 12:28:10 +0200
Subject: [PATCH 30/37] upgrade deform and deform_bootstrap

---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5104adb8042..3dfd8fac4b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1109,11 +1109,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   deform = buildPythonPackage rec {
-    name = "deform-0.9.7";
+    name = "deform-0.9.8";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
-      md5 = "d450eef05432d473257da5621c72c8b7";
+      sha256 = "15500rm33n6kxsdpqyn3ih25y3rvab4nxy2yzsj2754kdlhlyjpx";
     };
 
     buildInputs = [] ++ optional isPy26 unittest2;
@@ -1140,11 +1140,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   deform_bootstrap = buildPythonPackage rec {
-    name = "deform_bootstrap-0.2";
+    name = "deform_bootstrap-0.2.9";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/d/deform_bootstrap/${name}.tar.gz";
-      md5 = "57812251f327367761f32d49a8286aa4";
+      sha256 = "1hgq3vqsfqdmlyahnlc40w13viawhpzqf4jzigsggdb41x545fda";
     };
 
     propagatedBuildInputs = [ deform ];

From 64d648e92e70801f4dc55c31632d0ce8973b3083 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Sep 2013 13:57:32 +0200
Subject: [PATCH 31/37] Update nixUnstable

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index f61f5e2b95a..17e860f7d7c 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.6pre3215_2c1ecf8";
+  name = "nix-1.6pre3220_fecad91";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/5940181/download/5/${name}.tar.xz";
-    sha256 = "404fe856ae534b09e9a81d69751127e0987fea6bf2d0ec01acac3a9ea4ce72ae";
+    url = "http://hydra.nixos.org/build/6038922/download/5/${name}.tar.xz";
+    sha256 = "0251b8cb7ad2a4974a9c8002c65f1c6e1b334be082d3dd2f085929594637f947";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From 70fee5da112b8a0093d59ac16cdead4d0a72f357 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Sep 2013 15:54:06 +0200
Subject: [PATCH 32/37] Fix Nixpkgs evaluation

The evaluation of liferea causes an error:

  error: assertion failed at `/tmp/nix-build-nixpkgs-tarball-1.0pre28992_1628c03.drv-0/git-export/pkgs/desktops/gnome-2/desktop/libgweather/default.nix:4:1'

Why this happens is a mystery, since liferea doesn't depend on
libgweather.  The problem can be reproduced by evaluating:

  builtins.toXML (import <nixpkgs> { system = "x86_64-darwin"; }).liferea

It seems to have something to do with builderDefs magic in webkit_gtk2.

http://hydra.nixos.org/build/6039089
---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 4703a4f28c8..55e0ed88814 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "A GTK-based news feed agregator";
     homepage = http://lzone.de/liferea/;
     maintainers = [ stdenv.lib.maintainers.vcunat ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From b2c97f6ca53dd123a1320ae0fd5052c8c2677920 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Tue, 10 Sep 2013 16:06:56 +0200
Subject: [PATCH 33/37] Add statvfs haskell library

---
 .../libraries/haskell/statvfs/default.nix            | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/statvfs/default.nix

diff --git a/pkgs/development/libraries/haskell/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix
new file mode 100644
index 00000000000..604edc83139
--- /dev/null
+++ b/pkgs/development/libraries/haskell/statvfs/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "statvfs";
+  version = "0.1";
+  sha256 = "1v45lx7wr27f5sx7cpfsapx1r6akgf1q3hpip1ibbsbhj65ws2r2";
+  meta = {
+    description = "Get unix filesystem statistics with statfs, statvfs";
+    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 135e1b5660e..7db23042dca 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1857,6 +1857,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   statistics = callPackage ../development/libraries/haskell/statistics {};
 
+  statvfs = callPackage ../development/libraries/haskell/statvfs {};
+
   StrafunskiStrategyLib = callPackage ../development/libraries/haskell/Strafunski-StrategyLib {};
 
   streamproc = callPackage ../development/libraries/haskell/streamproc {};

From b73deae714b85ea4d182df73bf34a77f482a1166 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 10 Sep 2013 17:53:13 +0200
Subject: [PATCH 34/37] nix: Update to 1.6

---
 pkgs/tools/package-management/nix/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b6f8d5000a1..89cf2d1e00e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.5.3";
+  name = "nix-1.6";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-    sha256 = "070e82a155851900768eb4a638aa50a6df9a8475c6dbc78a3b4a7dea75d64201";
+    sha256 = "2e451a6ad0b43997d8df71d29a7d20ef42f7715fe16efbf4b53bdcdd1d5227fe";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc942c36b06..8bc25d24a92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9743,10 +9743,13 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
+  nixUnstable = nixStable;
+  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
   };
+  */
 
   nixops = callPackage ../tools/package-management/nixops { };
 

From d1882a1940a6503d540319a2da345baa770e6b76 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 10 Sep 2013 19:19:27 +0200
Subject: [PATCH 35/37] trac: Update to 1.0.1. The old version did not work at
 all with the current genshi package (0.7).

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3dfd8fac4b8..cb77e11babd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5563,11 +5563,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
 
 
   trac = buildPythonPackage {
-    name = "trac-0.12.2";
+    name = "trac-1.0.1";
 
     src = fetchurl {
-      url = http://ftp.edgewall.com/pub/trac/Trac-0.12.2.tar.gz;
-      sha256 = "1ihf5031pc1wpwbxpfzzz2bcpwww795n5y22baglyim1lalivd65";
+      url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz;
+      sha256 = "1nqa95fcnkpyq4jk6az7l7sqgm3b3pjq3bx1n7y4v3bad5jr1m4x";
     };
 
     # couple of failing tests

From 5a75874b96917baaf43e6d03135633b062dde9b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Sep 2013 21:15:41 +0200
Subject: [PATCH 36/37] all-packages.nix: add 'linuxHeaders36' attribute

We have that version of the kernel headers in Nixpkgs already, there was
just no attribute for them.
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bc25d24a92..56764892dba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6410,6 +6410,8 @@ let
 
   linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
 
+  linuxHeaders36 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { };
+
   linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };
 
   linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {

From e08fab28f5e5e2ca346faa5e0e8d787942a8733f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Sep 2013 21:16:33 +0200
Subject: [PATCH 37/37] Um, make that 'linuxHeaders26'. Sorry.

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56764892dba..87f376c1e25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6410,7 +6410,7 @@ let
 
   linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
 
-  linuxHeaders36 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { };
+  linuxHeaders26 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { };
 
   linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };