From fd896d09fa385481ee08cb5cf171890f624a548e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 21 Jan 2014 01:46:44 +0100
Subject: [PATCH 01/34] grsecurity: Fix build under new generic kernel
 derivation

---
 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 f1ab8ef3f9d..6877a71fe2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6557,11 +6557,6 @@ let
   };
 
   grsecurityOverrider = args: {
-    # Install gcc plugins. These are needed for compiling dependant packages.
-    postInstall = ''
-      ${args.postInstall or ""}
-      cp "tools/gcc/"*.so $out/lib/modules/$version/build/tools/gcc/
-    '';
     # Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins)
     # include libgmp headers, so we need these extra tweaks
     buildInputs = args.buildInputs ++ [ gmp ];
@@ -6577,10 +6572,12 @@ let
   # config options you need (e.g. by overriding extraConfig). See list of options here:
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
   linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
+    modDirVersion = "${linux_3_2.version}-grsec";
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 
   linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
+    modDirVersion = "${linux_3_12.version}-grsec";
     kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 

From aeda8d63b92dd5059f32b3b79567e714211f1c65 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 20 Jan 2014 02:18:33 +0100
Subject: [PATCH 02/34] grsecurity: Update stable and test patches

stable: 3.0-3.2.53-201312021727 -> 3.0-3.2.54-201401191012
test:   3.0-3.12.2-201312021733 -> 3.0-3.12.8-201401191015
---
 pkgs/os-specific/linux/kernel/patches.nix | 20 ++++++++++----------
 pkgs/top-level/all-packages.nix           |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index efa23f67846..8b658a6030e 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -78,25 +78,25 @@ rec {
   };
 
 
-  grsecurity_3_0_3_2_53 =
-    { name = "grsecurity-3.0-3.2.53";
+  grsecurity_3_0_3_2_54 =
+    { name = "grsecurity-3.0-3.2.54";
       patch = fetchurl {
-        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.53-201312021727.patch;
-        sha256 = "1ifndcbpz552d0n2dgb38di8lhqd4x2msshdbdx33jlfdl7mk6x4";
+        url = https://grsecurity.net/stable/grsecurity-3.0-3.2.54-201401191012.patch;
+        sha256 = "10kfdk46fgd1awys8f8520w7kanc4m0ckn28xg36473fi76i6snx";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.53
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.54
       features.apparmor = true;
     };
 
-  grsecurity_3_0_3_12_2 =
-    { name = "grsecurity-3.0-3.12.2";
+  grsecurity_3_0_3_12_8 =
+    { name = "grsecurity-3.0-3.12.8";
       patch = fetchurl {
-        url = https://grsecurity.net/test/grsecurity-3.0-3.12.2-201312021733.patch;
-        sha256 = "0xcsq6778rk9afg3078d772iflz7p4ahvr6wdq5c4s3jyssam783";
+        url = https://grsecurity.net/test/grsecurity-3.0-3.12.8-201401191015.patch;
+        sha256 = "0dy7daar873jp0afkf48l8ij1ii8cgcc9z5pn50h1fvhc9ap1j4f";
       };
       features.grsecurity = true;
-      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.2
+      # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.8
       features.apparmor = true;
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6877a71fe2d..01b153c4ee1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6573,12 +6573,12 @@ let
   # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options
   linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
     modDirVersion = "${linux_3_2.version}-grsec";
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 
   linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: {
     modDirVersion = "${linux_3_12.version}-grsec";
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ];
   })) (args: grsecurityOverrider args));
 
   linux_3_2_apparmor = lowPrio (linux_3_2.override {

From 39a31190f06b6973d9493f125c9c858a453a86b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 11:13:26 +0100
Subject: [PATCH 03/34] less: Build on Darwin

---
 pkgs/tools/misc/less/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 5acb0e0fb70..c51219839b2 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.greenwoodsoftware.com/less/;
     description = "A more advanced file pager than ‘more’";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }

From 5150dbfdbe4144770d1dae868172fb94d7e6be55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 11:55:12 +0100
Subject: [PATCH 04/34] openjdk-darwin: Behave the same as openjdk-linux

---
 .../compilers/openjdk-darwin/default.nix      | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index ff9f12f8023..3e4835c8b53 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, ...}:
+{ stdenv, fetchurl, setJavaClassPath }:
 let
-jdk = stdenv.mkDerivation {
+  jdk = stdenv.mkDerivation {
     name = "openjdk6-b16-24_apr_2009-r1";
 
     src = fetchurl {
@@ -11,6 +11,23 @@ jdk = stdenv.mkDerivation {
     installPhase = ''
       mkdir -p $out
       cp -vR * $out/
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/darwin/*_md.h $out/include/
+    '';
+
+    preFixup = ''
+      # Propagate the setJavaClassPath setup hook from the JRE so that
+      # any package that depends on the JRE has $CLASSPATH set up
+      # properly.
+      mkdir -p $out/nix-support
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+
+      # Set JAVA_HOME automatically.
+      mkdir -p $out/nix-support
+      cat <<EOF > $out/nix-support/setup-hook
+      if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+      EOF
     '';
 
     passthru.jre = jdk;

From e5995e0703de588af9d71e636eea7ddb1c695af0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 11:56:14 +0100
Subject: [PATCH 05/34] junixsocket: Support Darwin

Patch borrowed from Rob Vermaas.
---
 .../libraries/java/junixsocket/darwin.patch   | 20 +++++++++++++++++++
 .../libraries/java/junixsocket/default.nix    | 14 +++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/java/junixsocket/darwin.patch

diff --git a/pkgs/development/libraries/java/junixsocket/darwin.patch b/pkgs/development/libraries/java/junixsocket/darwin.patch
new file mode 100644
index 00000000000..97fd42d0b81
--- /dev/null
+++ b/pkgs/development/libraries/java/junixsocket/darwin.patch
@@ -0,0 +1,20 @@
+diff -rc junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java
+*** junixsocket-1.3/src/main/org/newsclub/net/unix/NativeUnixSocket.java        Tue Jul 20 14:59:41 2010
+--- junixsocket-1.3-new/src/main/org/newsclub/net/unix/NativeUnixSocket.java    Sun May 27 22:26:15 2012
+***************
+*** 43,49 ****
+              String prefix = "lib";
+              String suffix = ".so";
+              String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
+!             if ("macosx".equals(os)) {
+                  suffix = ".dylib";
+              } else if ("linux".equals(os) || "freebsd".equals(os)
+                      || "sunos".equals(os)) {
+--- 43,49 ----
+              String prefix = "lib";
+              String suffix = ".so";
+              String os = osName.replaceAll("[^A-Za-z0-9]", "").toLowerCase();
+!             if ("macosx".equals(os) || "darwin".equals(os)) {
+                  suffix = ".dylib";
+              } else if ("linux".equals(os) || "freebsd".equals(os)
+                      || "sunos".equals(os)) {
diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix
index 911cc6dd40d..e49e626aa00 100644
--- a/pkgs/development/libraries/java/junixsocket/default.nix
+++ b/pkgs/development/libraries/java/junixsocket/default.nix
@@ -8,11 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "0c6p8vmiv5nk8i6g1hgivnl3mpb2k3lhjjz0ss9dlirisfrxf1ym";
   };
 
+  patches = [ ./darwin.patch ];
+
   buildInputs = [ ant jdk junit ];
 
   preConfigure =
     ''
-      sed -i 's|/usr/bin/||' build.xml
+      substituteInPlace build.xml \
+        --replace /usr/bin/ "" \
+        --replace macosx darwin
       substituteInPlace src/main/org/newsclub/net/unix/NativeUnixSocketConfig.java \
         --replace /opt/newsclub/lib-native $out/lib
     '';
@@ -20,8 +24,10 @@ stdenv.mkDerivation rec {
   buildPhase = "ant";
 
   ANT_ARGS =
-    "-Dskip32=true -Dant.build.javac.source=1.6"
-    + stdenv.lib.optionalString stdenv.isDarwin " -DisMac=true";
+    # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib.
+    (if stdenv.is64bit && !stdenv.isDarwin then [ "-Dskip32=true" ] else [ "-Dskip64=true" ])
+    ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "-DisMac=true";
 
   installPhase =
     ''
@@ -34,6 +40,6 @@ stdenv.mkDerivation rec {
     description = "A Java/JNI library for using Unix Domain Sockets from Java";
     homepage = https://code.google.com/p/junixsocket/;
     license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }

From 197de444dfaad1137b45b7ad61cd36e16a5c0852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Tue, 28 Jan 2014 12:13:28 +0100
Subject: [PATCH 06/34] ipython: disable support for qtconsole, pylabQt and
 pylab on Darwin

Qt and CUPS are not supported on Darwin and are dependencies.

Note: this makes ipython the same as ipythonLight on Darwin, but
ipython is used as an input for other packages (ipdb and ipdplugin)
and it is reasonable to assume that users on other platforms may
choose ipythonLight.
---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5718572399f..62c37e5d30b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -65,6 +65,9 @@ pythonPackages = modules // import ./python-packages-generated.nix {
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;
+    qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin
+    pylabQtSupport = !pkgs.stdenv.isDarwin;
+    pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin
   };
 
   ipythonLight = lowPrio (import ../shells/ipython {

From bc5995e3924397683b12766653087ff4bfbafbd7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 13:36:35 +0100
Subject: [PATCH 07/34] cpio: Fix build on Darwin

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

diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index ec873507c85..2f3a1b97487 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -8,10 +8,11 @@ stdenv.mkDerivation {
     sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd";
   };
 
-  patches = [ ./no-gets.patch ];
+  patches = [ ./no-gets.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch;
 
   meta = {
     homepage = http://www.gnu.org/software/cpio/;
     description = "A program to create or extract from cpio archives";
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 4350c64bba80a598c9a9ee242e8dd91dea34b1aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:31 +0100
Subject: [PATCH 08/34] haskell-GlomeVec: update to version 0.2

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

diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix
index d22273f2030..710605c52e3 100644
--- a/pkgs/development/libraries/haskell/GlomeVec/default.nix
+++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "GlomeVec";
-  version = "0.1.2";
-  sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639";
+  version = "0.2";
+  sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Glome";
     description = "Simple 3D vector library";

From 8c58f6904a01e67fa0d08346a810f236f9013f17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:31 +0100
Subject: [PATCH 09/34] haskell-JuicyPixels: update to version 3.1.3.2

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

diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index 9b34bc9672b..57c37139d4f 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels";
-  version = "3.1.3.1";
-  sha256 = "03kbvm3y5di274gzz8sr24z9j27rdayx4kkbf5hfvl325ghidhx9";
+  version = "3.1.3.2";
+  sha256 = "0c0vavqisljsl8v8hvmxj8q3hmjq5layanbbyp0zcbj6yxv8s62a";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];

From 728c16612310e42d878af5bb44a31f98d02f85d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 10/34] haskell-diagrams-cairo: update to version 1.0.1

---
 pkgs/development/libraries/haskell/diagrams/cairo.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index ee9b0907347..53e9e0ac2cd 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -1,14 +1,14 @@
 { cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib
-, filepath, lens, mtl, split, statestack, time
+, filepath, hashable, lens, mtl, split, statestack, time
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.0";
-  sha256 = "1m549ryfyfjc6sg3xi0wlcpi4c0xj6yfrpjmxgiyl76rwaqns989";
+  version = "1.0.1";
+  sha256 = "16h1xz5amn0yd3h9rss0skaq08k1cy91cncxb9ky020s0wcix9fm";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
-    lens mtl split statestack time
+    hashable lens mtl split statestack time
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams";

From b1e174725b72738412e70dbce5ee41da08402735 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 11/34] haskell-diagrams-lib: update to version 1.0.1

---
 pkgs/development/libraries/haskell/diagrams/lib.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 858e2497642..6dbedd5ecda 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -1,16 +1,16 @@
 { cabal, active, colour, dataDefaultClass, diagramsCore, filepath
-, fingertree, intervals, lens, MemoTrie, monoidExtras, NumInstances
-, optparseApplicative, safe, semigroups, tagged, vectorSpace
-, vectorSpacePoints
+, fingertree, hashable, intervals, lens, MemoTrie, monoidExtras
+, NumInstances, optparseApplicative, safe, semigroups, tagged
+, vectorSpace, vectorSpacePoints
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.0.0.1";
-  sha256 = "1ilkc8dh1ma0wwmzgy6x3a6q6bwlw7dfv3mb24a5ny4i3wgvsnv8";
+  version = "1.0.1";
+  sha256 = "0cjhb6dm0n4a7s8z0lyihql7dz34pdbm3ahm2p0yya4xf9pf0fw4";
   buildDepends = [
     active colour dataDefaultClass diagramsCore filepath fingertree
-    intervals lens MemoTrie monoidExtras NumInstances
+    hashable intervals lens MemoTrie monoidExtras NumInstances
     optparseApplicative safe semigroups tagged vectorSpace
     vectorSpacePoints
   ];

From 2cd347770ca547ed1ed8f7a3353383863c3e1852 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 12/34] haskell-diagrams-svg: update to version 1.0.1

---
 pkgs/development/libraries/haskell/diagrams/svg.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index dea68b93e6d..1d64d402bdf 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -1,14 +1,15 @@
-{ cabal, blazeSvg, colour, diagramsCore, diagramsLib, filepath
-, lens, monoidExtras, mtl, split, time, vectorSpace
+{ cabal, blazeMarkup, blazeSvg, colour, diagramsCore, diagramsLib
+, filepath, hashable, lens, monoidExtras, mtl, split, time
+, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.0";
-  sha256 = "13v1q9d2004k4324b0yxlmwrsanb0mk9pz0gqfxvx9v27sry12sl";
+  version = "1.0.1";
+  sha256 = "15adic3dl4qqrd63jx1rc1w4wx270vm7zc3hr69mnh0wn0cr0ga5";
   buildDepends = [
-    blazeSvg colour diagramsCore diagramsLib filepath lens monoidExtras
-    mtl split time vectorSpace
+    blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
+    hashable lens monoidExtras mtl split time vectorSpace
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";

From f1530932bf282362912069f88023774e083b5ded Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 13/34] haskell-esqueleto: update to version 1.3.4.5

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

diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index 5376ac4d7e6..3bbd8681ddb 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "1.3.4.3";
-  sha256 = "1p35nzaqmpcc7slr10ihlc54kz5zv5ak0ql848m3xpbjfzq6f6vc";
+  version = "1.3.4.5";
+  sha256 = "0fw57dn67gx5v7drd4g7xbj1z614sr3lxw7gcciypnjc7qkqjgv7";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers

From 9c358f40232493d02001df1a73fc2ce012182411 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 14/34] haskell-hit: update to version 0.5.3

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

diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index fa74f1738b6..0c4020f746c 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.5.2";
-  sha256 = "05f5xm23049ngvsch9cp2snyknk3qknx1jlb42zi0nbv8f1hymnn";
+  version = "0.5.3";
+  sha256 = "0s6nfjdasf62x28vzks809slnh0p6j3g101jzqlfh7nrnj5k6q1d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From e3f528ad8a44b2e0ed439a5be303446682dff6ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 15/34] haskell-http-client: update to version 0.2.1.1

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 092b696dc19..7d85c29e656 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.2.1";
-  sha256 = "1hwr8pjlal88b6clmrs0cksmyy1vmbybvr78s6kb2ppwrzmd2v8q";
+  version = "0.2.1.1";
+  sha256 = "03hcwz53sjvw3nv6xbdf24a4ny229ljq3rx89plmsxpjb44qwlq2";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
     deepseq failure httpTypes network publicsuffixlist text time

From ea8c3ee7a2227fdbeebfdf5b9c9d7adffaac6c38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 16/34] haskell-http-conduit: update to version 2.0.0.4

---
 .../libraries/haskell/http-conduit/default.nix       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index bb237f16d58..c55e8a4e6e7 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -5,14 +5,14 @@
 , httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase
 , mimeTypes, monadControl, mtl, network, networkConduit
 , publicsuffixlist, random, regexCompat, resourcet, socks, text
-, time, tls, tlsExtra, transformers, transformersBase, utf8String
-, void, wai, warp, warpTls, zlibConduit
+, time, transformers, transformersBase, utf8String, void, wai, warp
+, warpTls, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.0.0.3";
-  sha256 = "1s3nyc3wwpqildhmkv5fps2a0552yrnwcqjv4bxcvg581k5sj42i";
+  version = "2.0.0.4";
+  sha256 = "0902sklwfb9gr1yqxp15qa4qqik75jv6pl0nfh2s4vq65sh4gndq";
   buildDepends = [
     conduit httpClient httpClientConduit httpClientTls httpTypes
     liftedBase resourcet transformers
@@ -23,8 +23,8 @@ cabal.mkDerivation (self: {
     dataDefault deepseq failure filepath hspec httpClient
     httpClientMultipart httpTypes HUnit liftedBase mimeTypes
     monadControl mtl network networkConduit publicsuffixlist random
-    regexCompat resourcet socks text time tls tlsExtra transformers
-    transformersBase utf8String void wai warp warpTls zlibConduit
+    regexCompat resourcet socks text time transformers transformersBase
+    utf8String void wai warp warpTls zlibConduit
   ];
   doCheck = false;
   meta = {

From 838e8d3426fbf2017c18fa77e6d5eabaf566075c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 17/34] haskell-network-conduit: update to version 1.0.2

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

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 5dec259f5f5..5ad390c39e7 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.1.1";
-  sha256 = "1mji8zb0chnnxl7z4dgijls6szfa6c47zmhx0v1dc9k27bnc0mhx";
+  version = "1.0.2";
+  sha256 = "00x9m4lsh4hkvw6z6kqd3q7hpy2q905vcnj9x1wbn6swz621h4rw";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];

From 221eafa7aac00ea99b16d00b7ed52e6a5d43cc7e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:32 +0100
Subject: [PATCH 18/34] haskell-stm-conduit: update to version 2.2.1.1

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

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index f05396f8a6d..b53b310dafe 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.2.1";
-  sha256 = "15ym83c42krx19rw719yqlib1vcg68jmx48rihy5aimc0m5m307b";
+  version = "2.2.1.1";
+  sha256 = "0rqn6xhqhaqiy0n2g46z58zzccq1i749p97aihrvjpikrz5kypka";
   buildDepends = [
     async cereal cerealConduit conduit liftedAsync liftedBase
     monadControl monadLoops resourcet stm stmChans transformers

From 2c23e7227d19be79c0ee8c1293d37c301088a2c9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:33 +0100
Subject: [PATCH 19/34] haskell-wai-extra: update to version 2.0.3.2

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

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 451efd8a0a7..3022b0565de 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "2.0.3.1";
-  sha256 = "1ckn90j2zmh77mgpan28v315qipw5v0ji9k3lq1ni9kzjap7pl5a";
+  version = "2.0.3.2";
+  sha256 = "0zhwk78ny7ak6sf974gqg3zjrrmivgb7dvxs5jbqghq0a6xs97zi";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase

From dc354b0beb6d3fd6432fa918655b1e29bc0db88c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 11:51:33 +0100
Subject: [PATCH 20/34] haskell-HaRe: update to version 0.7.1.0

---
 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 6c24b509db5..556359b9bc5 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.7.0.9";
-  sha256 = "1a3kf6hdzchcyb743l6ikyw3nclcy8g7a5kaj4jgxqvmss9z73f1";
+  version = "0.7.1.0";
+  sha256 = "07v0c177dydg4hv01knxyxid2ys37wkx0mz4nb9ca6b9s12781hn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From cae97e9418908c374d41939456da7a55c3275518 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 20:58:15 +0100
Subject: [PATCH 21/34] Add newly required Haskell packages.

 - asn1-encoding: add version 0.8.1.2
 - asn1-parse: add version 0.8.1
 - x509-store: add version 1.4.3
 - x509-system: add version 1.4.2
 - x509-validation: add version 1.5.0
 - x509: add version 1.4.7
---
 .../haskell/asn1-encoding/default.nix         | 16 +++++++++++++
 .../libraries/haskell/asn1-parse/default.nix  | 14 +++++++++++
 .../libraries/haskell/x509-store/default.nix  | 18 ++++++++++++++
 .../libraries/haskell/x509-system/default.nix | 14 +++++++++++
 .../haskell/x509-validation/default.nix       | 21 ++++++++++++++++
 .../libraries/haskell/x509/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 12 ++++++++++
 7 files changed, 119 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/asn1-encoding/default.nix
 create mode 100644 pkgs/development/libraries/haskell/asn1-parse/default.nix
 create mode 100644 pkgs/development/libraries/haskell/x509-store/default.nix
 create mode 100644 pkgs/development/libraries/haskell/x509-system/default.nix
 create mode 100644 pkgs/development/libraries/haskell/x509-validation/default.nix
 create mode 100644 pkgs/development/libraries/haskell/x509/default.nix

diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
new file mode 100644
index 00000000000..c151da0c7dd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix
@@ -0,0 +1,16 @@
+{ cabal, asn1Types, mtl, text, time }:
+
+cabal.mkDerivation (self: {
+  pname = "asn1-encoding";
+  version = "0.8.1.2";
+  sha256 = "01i7zga9nfvccgjixnxza9mi7jj4k6308g8asnljr44s1k8rikwm";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ asn1Types mtl text time ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-asn1";
+    description = "ASN1 data reader and writer in RAW, BER and DER forms";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/asn1-parse/default.nix b/pkgs/development/libraries/haskell/asn1-parse/default.nix
new file mode 100644
index 00000000000..16386d939e4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/asn1-parse/default.nix
@@ -0,0 +1,14 @@
+{ cabal, asn1Encoding, asn1Types, mtl, text, time }:
+
+cabal.mkDerivation (self: {
+  pname = "asn1-parse";
+  version = "0.8.1";
+  sha256 = "021mbm5aayfx9vhxq4x1jj3gpnzq0bqaqcl1zsaa2a6l0qzpnmh9";
+  buildDepends = [ asn1Encoding asn1Types mtl text time ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-asn1";
+    description = "Simple monadic parser for ASN1 stream types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix
new file mode 100644
index 00000000000..bc1c0c47dc9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/x509-store/default.nix
@@ -0,0 +1,18 @@
+{ cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl
+, pem, time, x509
+}:
+
+cabal.mkDerivation (self: {
+  pname = "x509-store";
+  version = "1.4.3";
+  sha256 = "1px5r5y4vaxx479d4av333g1sc03mz1aalpvwwkbi5bwnxydvf01";
+  buildDepends = [
+    asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-certificate";
+    description = "X.509 collection accessing and storing methods";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix
new file mode 100644
index 00000000000..36d1f5bd706
--- /dev/null
+++ b/pkgs/development/libraries/haskell/x509-system/default.nix
@@ -0,0 +1,14 @@
+{ cabal, filepath, mtl, pem, time, x509, x509Store }:
+
+cabal.mkDerivation (self: {
+  pname = "x509-system";
+  version = "1.4.2";
+  sha256 = "1r22ignmwkv1z26bmnwh7prqy69cln26pfyyaf5r2vw8s66rgl39";
+  buildDepends = [ filepath mtl pem time x509 x509Store ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-certificate";
+    description = "Handle per-operating-system X.509 accessors and storage";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/x509-validation/default.nix b/pkgs/development/libraries/haskell/x509-validation/default.nix
new file mode 100644
index 00000000000..27f5d6ecbbe
--- /dev/null
+++ b/pkgs/development/libraries/haskell/x509-validation/default.nix
@@ -0,0 +1,21 @@
+{ cabal, asn1Encoding, asn1Types, byteable, cryptohash
+, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath, mtl
+, network, pem, time, x509, x509Store
+}:
+
+cabal.mkDerivation (self: {
+  pname = "x509-validation";
+  version = "1.5.0";
+  sha256 = "1xarn00ipi77whly5yjlpqa0xd25lj0jf4xk8ylp4ba58hvcxqrn";
+  buildDepends = [
+    asn1Encoding asn1Types byteable cryptohash cryptoPubkey
+    cryptoPubkeyTypes dataDefaultClass filepath mtl network pem time
+    x509 x509Store
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-certificate";
+    description = "X.509 Certificate and CRL validation";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix
new file mode 100644
index 00000000000..0aababd4715
--- /dev/null
+++ b/pkgs/development/libraries/haskell/x509/default.nix
@@ -0,0 +1,24 @@
+{ cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash
+, cryptoPubkeyTypes, filepath, HUnit, mtl, pem, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "x509";
+  version = "1.4.7";
+  sha256 = "0bm5sijahpih2c6scz3y32904wzvmllgslg9d547cksbgy7lyx1h";
+  buildDepends = [
+    asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes
+    filepath mtl pem time
+  ];
+  testDepends = [
+    asn1Types cryptoPubkeyTypes HUnit mtl QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 time
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-certificate";
+    description = "X509 reader and writer";
+    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 6e738048a92..0087aa59df3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -567,6 +567,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   asn1Data = callPackage ../development/libraries/haskell/asn1-data {};
 
+  asn1Encoding = callPackage ../development/libraries/haskell/asn1-encoding {};
+
+  asn1Parse = callPackage ../development/libraries/haskell/asn1-parse {};
+
   asn1Types = callPackage ../development/libraries/haskell/asn1-types {};
 
   AspectAG = callPackage ../development/libraries/haskell/AspectAG {};
@@ -2502,6 +2506,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {};
 
+  x509 = callPackage ../development/libraries/haskell/x509 {};
+
+  x509Store = callPackage ../development/libraries/haskell/x509-store {};
+
+  x509System = callPackage ../development/libraries/haskell/x509-system {};
+
+  x509Validation = callPackage ../development/libraries/haskell/x509-validation {};
+
   X11 = callPackage ../development/libraries/haskell/X11 {};
 
   X11Xft = callPackage ../development/libraries/haskell/X11-xft {};

From c13d4085a3a78bc2a0b33248a4293c3521be7f23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 21:22:52 +0100
Subject: [PATCH 22/34] haskell-network-conduit: disable test suite to fix
 build errors with GHC 7.4.2

https://github.com/snoyberg/conduit/issues/134
---
 pkgs/development/libraries/haskell/network-conduit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 5ad390c39e7..cb10603355c 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
     conduit liftedBase monadControl network transformers
   ];
   testDepends = [ conduit ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Stream socket data using conduits";

From b8d6e1d4586d1c43f0db0b9f02ed6feedea5486d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Jan 2014 21:45:28 +0100
Subject: [PATCH 23/34] haskell-diagrams-svg: jailbreak to fix build with
 recent blaze-markup

---
 pkgs/development/libraries/haskell/diagrams/svg.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 1d64d402bdf..4f1dfdc8672 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
     hashable lens monoidExtras mtl split time vectorSpace
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "SVG backend for diagrams drawing EDSL";

From 63ec2bec8f3791370032ca821a4292c6ffc79f1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 24/34] haskell-git-annex: update to version 5.20140127

---
 .../git-and-tools/git-annex/default.nix       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index cd25bbfdc6f..6a4272101b3 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -5,17 +5,18 @@
 , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse
 , json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl
 , network, networkConduit, networkInfo, networkMulticast
-, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa
-, rsync, SafeSemaphore, SHA, stm, tasty, tastyHunit
-, tastyQuickcheck, text, time, transformers, unixCompat, utf8String
-, uuid, wai, waiLogger, warp, which, xmlConduit, xmlTypes, yesod
-, yesodCore, yesodDefault, yesodForm, yesodStatic
+, networkProtocolXmpp, openssh, optparseApplicative, perl
+, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, SHA, stm
+, tasty, tastyHunit, tastyQuickcheck, text, time, transformers
+, unixCompat, utf8String, uuid, wai, waiLogger, warp, which
+, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
+, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140116";
-  sha256 = "18l9nflmnfaqmrq9nvypv2jwn3v2461lb4m0jjpai6aipzl91jw2";
+  version = "5.20140127";
+  sha256 = "0aqqnv0faiva9vf0nb0d8xsd659y8cyrnyy6mfjdqjqdw8wha3yr";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -25,10 +26,10 @@ cabal.mkDerivation (self: {
     hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json
     MissingH MonadCatchIOTransformers monadControl mtl network
     networkConduit networkInfo networkMulticast networkProtocolXmpp
-    QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit
-    tastyQuickcheck text time transformers unixCompat utf8String uuid
-    wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault
-    yesodForm yesodStatic
+    optparseApplicative QuickCheck random regexTdfa SafeSemaphore SHA
+    stm tasty tastyHunit tastyQuickcheck text time transformers
+    unixCompat utf8String uuid wai waiLogger warp xmlConduit xmlTypes
+    yesod yesodCore yesodDefault yesodForm yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3

From 4cbf42f006eb9a7ccfe31cf906070b9753509f8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 25/34] haskell-direct-sqlite: update to version 2.3.11

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

diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
index 9ffd3ca728d..12e61ebb9ef 100644
--- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "direct-sqlite";
-  version = "2.3.9";
-  sha256 = "0haq14acdijd41jvah6f6l6qlqc4wjp3mwkx57pz4q5m6qvxrz44";
+  version = "2.3.11";
+  sha256 = "0pd5qv8aq47d5n2sd99yblxiq70zvmy2rc71ys73a3d846k0ncs0";
   buildDepends = [ text ];
   testDepends = [ base16Bytestring HUnit text ];
   meta = {

From 55a8134bbec4f8fdd15da3b71946aad78512f0c0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 26/34] haskell-highlighting-kate: update to version 0.5.6.1

---
 .../libraries/haskell/highlighting-kate/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 863a0441b02..497d1083f55 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.6";
-  sha256 = "1nd1ima3x7bb3lhkpzfw1qbl8g8mwp1ixk2w7nf2p1200c5zs49d";
+  version = "0.5.6.1";
+  sha256 = "0hwzybihx5znd2z00kqcffqmng7vwynmav0x0zf2b9g415c2lx23";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];

From 048029493750a9f8d253054f10fe6158f59835b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 27/34] haskell-network-conduit: update to version 1.0.2.1

---
 .../libraries/haskell/network-conduit/default.nix            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index cb10603355c..024cf9b1d41 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,13 +3,12 @@
 
 cabal.mkDerivation (self: {
   pname = "network-conduit";
-  version = "1.0.2";
-  sha256 = "00x9m4lsh4hkvw6z6kqd3q7hpy2q905vcnj9x1wbn6swz621h4rw";
+  version = "1.0.2.1";
+  sha256 = "1dq7pwimjkr0wpyjphbvjy3klkcjl8jin76am5jbz3cxk1dr20jk";
   buildDepends = [
     conduit liftedBase monadControl network transformers
   ];
   testDepends = [ conduit ];
-  doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
     description = "Stream socket data using conduits";

From 9e36e4be1837ed2f87341fb4b7f616712e217409 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 28/34] haskell-yaml: update to version 0.8.5.4

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

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index fb8709f5a78..8e3a3e46f45 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -1,15 +1,15 @@
-{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet, text
-, transformers, unorderedContainers, vector
+{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet
+, scientific, text, transformers, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.5.3";
-  sha256 = "028wxp3jcvdy63707jhxm9mmkbxz9ni1c63rb7wvzjswijp3p95b";
+  version = "0.8.5.4";
+  sha256 = "0mn1i0whqr9q6vh43x5xa0p4xxckqszhsi62warx1kjvrq4yil6f";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson attoparsec conduit resourcet text transformers
+    aeson attoparsec conduit resourcet scientific text transformers
     unorderedContainers vector
   ];
   testDepends = [

From 069220a868a3ac3f1ce60cd30e73088de5b61dde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:43 +0100
Subject: [PATCH 29/34] haskell-yesod-bin: update to version 1.2.5.7

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

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 60618be3616..af6b4f339f6 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.5.6";
-  sha256 = "1acqfg9g5xjfmpby1xham2ygvbydn0srw2c7hajvfwalc6zkxrny";
+  version = "1.2.5.7";
+  sha256 = "0vxkwdqmfi2ccknmgx0xh6w1p7bw3wi24w3c3fw80g72j9sxr5hn";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 134d52cb5fb2328add74107acf93d2c616abdbcd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Jan 2014 10:31:44 +0100
Subject: [PATCH 30/34] haskell-HaRe: update to version 0.7.1.1

---
 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 556359b9bc5..92bb973b558 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.7.1.0";
-  sha256 = "07v0c177dydg4hv01knxyxid2ys37wkx0mz4nb9ca6b9s12781hn";
+  version = "0.7.1.1";
+  sha256 = "1gh0md8gfchniclck5ddbkdwf9dl01mkcdmdx3n3f59rx9qi8g0h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From a8a5a5905904b1319af5a0e1cfe03e577333013e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 15:22:51 +0100
Subject: [PATCH 31/34] stdenv-linux: Fix binutils override

This ensures that pkgs.binutils equals the binutils used in the final
stdenv, as intended.
---
 pkgs/stdenv/linux/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index bedeea0915d..408c362bedb 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -296,12 +296,13 @@ rec {
     extraAttrs = {
       inherit (stdenvLinuxBoot3Pkgs) glibc;
       inherit platform bootstrapTools;
-      shellPackage = stdenvLinuxBoot4Pkgs.bash; 
+      shellPackage = stdenvLinuxBoot4Pkgs.bash;
     };
 
     overrides = pkgs: {
       inherit gcc;
-      inherit (stdenvLinuxBoot3Pkgs) binutils glibc;
+      inherit (stdenvLinuxBoot3Pkgs) glibc;
+      inherit (stdenvLinuxBoot4Pkgs) binutils;
       inherit (stdenvLinuxBoot4Pkgs)
         gzip bzip2 xz bash coreutils diffutils findutils gawk
         gnumake gnused gnutar gnugrep gnupatch patchelf

From 577c20c23b8590fcbb527f7831f8def0c52c479e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 11 Jan 2014 22:11:32 +0100
Subject: [PATCH 32/34] tigervnc: fix ctrl-* keys, eg ctrl-c ctrl-v ctrl-d by
 applying patch to fltk

I'm unsure about
- is it ok to apply this patch globally, or should it be overridden for tigervnc only?
- how many rebuilds it triggers
- whether it was neccessary to update to latest dev version (seems to work)
The bug report indicates that others distros just includes this patch (?)

Cf. #1498. vcunat: the patch should be usable globally, as e.g. Arch does it.
Using autoreconfHook doesn't work for me, maybe --force is bad for it.
---
 pkgs/development/libraries/fltk/fltk13.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fltk/fltk13.nix b/pkgs/development/libraries/fltk/fltk13.nix
index c6951db228b..8fb4d40b1db 100644
--- a/pkgs/development/libraries/fltk/fltk13.nix
+++ b/pkgs/development/libraries/fltk/fltk13.nix
@@ -1,5 +1,8 @@
 { composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
-, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
+, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
+
+, automake, autoconf, libtool
+}:
 
 let inherit (composableDerivation) edf; in
 
@@ -14,7 +17,12 @@ composableDerivation.composableDerivation {} {
 
   propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  enableParallelBilding = true;
+
+  nativeBuildInputs = [
+    pkgconfig
+    automake autoconf libtool # only required because of patch
+  ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?
@@ -46,4 +54,11 @@ composableDerivation.composableDerivation {} {
     description = "A C++ cross-platform light-weight GUI library binding";
     homepage = http://www.fltk.org;
   };
+
+  patches = [
+    # https://bugs.archlinux.org/task/36186
+    (fetchurl {
+    url = "https://bugs.archlinux.org/task/36186?getfile=10750";
+    sha256 = "1hpb1i87nc3zw6mgpgf3bfv557ci930bsn6rwlhaif51nlqd2wbj";
+  }) ];
 }

From 1a68ee7deb2d9dbc6b6d18d5bd49677a6328b89d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 28 Jan 2014 16:13:01 +0100
Subject: [PATCH 33/34] Disable FreeBSD builds

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index c0800c8cad1..3d7fbd1c57b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -12,7 +12,7 @@
 { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
 , # The platforms for which we build Nixpkgs.
-  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ]
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
 }:
 
 with import ./release-lib.nix { inherit supportedSystems; };

From 6f5be260b47c65dfc517ecbdb6bbc0a6826135fa Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 28 Jan 2014 17:24:00 +0100
Subject: [PATCH 34/34] Adopt packages.

---
 pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix | 2 +-
 pkgs/applications/graphics/photivo/default.nix              | 5 +++++
 pkgs/applications/networking/browsers/w3m/default.nix       | 3 ++-
 pkgs/development/tools/build-managers/cmake/default.nix     | 2 +-
 pkgs/development/tools/misc/lsof/default.nix                | 1 +
 pkgs/games/stepmania/default.nix                            | 5 +++++
 pkgs/os-specific/linux/pam_krb5/default.nix                 | 1 +
 pkgs/servers/dict/default.nix                               | 1 +
 8 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index e0373fca5df..3ba848affc0 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://emacs-w3m.namazu.org/;
 
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
   };
 }
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 7c9ff32ec77..61e3f666dca 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -18,4 +18,9 @@ stdenv.mkDerivation rec {
         -e s,@INSTALL@,$out/share/photivo, \
         -i Sources/ptSettings.cpp
   '';
+
+  meta = with stdenv.lib; {
+      platforms = platforms.linux;
+      maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 5953111fad5..5f046f7b732 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -39,8 +39,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://w3m.sourceforge.net/;
     description = "A text-mode web browser";
+    maintainers = maintainers.mornfall;
   };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 35ae214266d..c71592c8ec8 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     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 ];
+    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
   };
 }
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index bdd35dc50f0..2469a0210b3 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation {
       socket (IPv6/IPv4/UNIX local), or partition (by opening a file
       from it).
     '';
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 130f1f905a4..6a54dd7512f 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -23,4 +23,9 @@ stdenv.mkDerivation rec {
     echo "exec $out/stepmania" >> $out/bin/stepmania
     chmod +x $out/bin/stepmania
   '';
+
+  meta = with stdenv.lib; {
+      platforms = platforms.linux;
+      maintainers = maintainers.mornfall;
+  };
 }
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
index 5f95811e0f6..ad60e63c263 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
       pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV
       credentials and/or use them to set up AFS tokens for a user's session.
     '';
+    maintainers = stdenv.lib.maintainers.mornfall;
   };
 }
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index 0b78bb9ae94..51de674eb9f 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -14,5 +14,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Dict protocol server and client";
+    maintainers = with stdenv.lib.maintainers; mornfall;
   };
 }