From 7bbe9390f95efde753bd5e4b9698001cc5256012 Mon Sep 17 00:00:00 2001
From: Cody Goodman <codygman.consulting@gmail.com>
Date: Mon, 14 Jul 2014 00:42:31 -0500
Subject: [PATCH 001/107] dom-selector: add version 0.2.0.1

---
 .../haskell/dom-selector/default.nix          | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/dom-selector/default.nix

diff --git a/pkgs/development/libraries/haskell/dom-selector/default.nix b/pkgs/development/libraries/haskell/dom-selector/default.nix
new file mode 100644
index 000000000000..c220e857d10a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dom-selector/default.nix
@@ -0,0 +1,21 @@
+{ cabal, blazeHtml, htmlConduit, parsec, QuickCheck, text, thLift
+, xmlConduit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "dom-selector";
+  version = "0.2.0.1";
+  sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22";
+  buildDepends = [
+    blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
+  ];
+  testDepends = [
+    blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
+  ];
+  meta = {
+    homepage = "https://github.com/nebuta/";
+    description = "DOM traversal by CSS selectors for xml-conduit package";
+    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 d464529de976..6eae5a70aec1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -659,6 +659,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   doctestProp = callPackage ../development/libraries/haskell/doctest-prop {};
 
+  domSelector = callPackage ../development/libraries/haskell/dom-selector {};
+
   dotgen = callPackage ../development/libraries/haskell/dotgen {};
 
   doubleConversion = callPackage ../development/libraries/haskell/double-conversion {};

From d77572fb769f6ce47f3a93af213b835564f07c76 Mon Sep 17 00:00:00 2001
From: Cody Goodman <codygman.consulting@gmail.com>
Date: Mon, 14 Jul 2014 00:58:00 -0500
Subject: [PATCH 002/107] dom-selector: Skip tests

I have also filed an issue with the package maintainer at nebuta/dom-selector#3
---
 pkgs/development/libraries/haskell/dom-selector/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/dom-selector/default.nix b/pkgs/development/libraries/haskell/dom-selector/default.nix
index c220e857d10a..789eb354b310 100644
--- a/pkgs/development/libraries/haskell/dom-selector/default.nix
+++ b/pkgs/development/libraries/haskell/dom-selector/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/nebuta/";
     description = "DOM traversal by CSS selectors for xml-conduit package";

From 49e6ef2a19161ffbbdede9451bf22b0d33cd71cb Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 25 Jul 2014 13:22:33 +0200
Subject: [PATCH 003/107] Fix trackpoint configuration on some systems

---
 nixos/modules/tasks/trackpoint.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index 4be2c3eb4c47..25ada145ac69 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -54,10 +54,17 @@ with lib;
         task = true;
 
         script = ''
-          echo -n ${toString config.hardware.trackpoint.sensitivity} \
-            > /sys/devices/platform/i8042/serio1/sensitivity
-          echo -n ${toString config.hardware.trackpoint.speed} \
-            > /sys/devices/platform/i8042/serio1/speed
+          for directory in /sys/devices/platform/i8042/serio1 \
+                           /sys/devices/platform/i8042/serio1/serio2 \
+                           /sys/devices/platform/i8042/serio4/serio5; do
+            if [ -e "$directory/speed" ]; then
+              echo -n ${toString config.hardware.trackpoint.speed} \
+                > "$directory/speed"
+              echo -n ${toString config.hardware.trackpoint.sensitivity} \
+                > "$directory/sensitivity"
+              break
+            fi
+          done
         '';
       };
          

From 6fe59796b2e79a5c2c15d7977eacb6f08b982a5b Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 25 Jul 2014 17:40:13 +0200
Subject: [PATCH 004/107] Use a udev rule for trackpoint configuration

---
 nixos/modules/tasks/trackpoint.nix | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index 25ada145ac69..d2d46c8c45a4 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -46,28 +46,10 @@ with lib;
 
   config = mkIf config.hardware.trackpoint.enable {
 
-    jobs.trackpoint =
-      { description = "Initialize trackpoint";
-
-        startOn = "started udev";
-
-        task = true;
-
-        script = ''
-          for directory in /sys/devices/platform/i8042/serio1 \
-                           /sys/devices/platform/i8042/serio1/serio2 \
-                           /sys/devices/platform/i8042/serio4/serio5; do
-            if [ -e "$directory/speed" ]; then
-              echo -n ${toString config.hardware.trackpoint.speed} \
-                > "$directory/speed"
-              echo -n ${toString config.hardware.trackpoint.sensitivity} \
-                > "$directory/sensitivity"
-              break
-            fi
-          done
-        '';
-      };
-         
+    services.udev.extraRules =
+    ''
+      ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}"
+    '';
   };
 
 }

From ead06339b86e6298f1eb2cc1f38a07f71cae99ec Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 28 Jul 2014 23:33:05 +0200
Subject: [PATCH 005/107] Add activationScript for TrackPoint configuration

---
 nixos/modules/tasks/trackpoint.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index d2d46c8c45a4..d1c6f8ac1565 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -50,6 +50,11 @@ with lib;
     ''
       ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}"
     '';
+
+    system.activationScripts.trackpoint =
+      ''
+        ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint"
+      '';
   };
 
 }

From 9d3fbcd05435411e49e588fb4b23b32856549831 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 3 Aug 2014 16:09:45 +0200
Subject: [PATCH 006/107] tomcat: Fix evaluation after e27dcff.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/web-servers/tomcat.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 16958f24030a..c2f464014ae6 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -79,8 +79,8 @@ in
 
       jdk = mkOption {
         default = pkgs.jdk;
-        description "Which JDK to use.";
-      }
+        description = "Which JDK to use.";
+      };
 
       axis2 = {
 

From 97a1b91f1b7bd5eeac13ddca3f5be08cac3085b6 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Sun, 3 Aug 2014 15:03:07 +0200
Subject: [PATCH 007/107] libid3tag: move pkgconfig file into the
 nix-expression directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn Forsman:
 * use "mkdir -p" instead of "ensureDir" (deprecated)
 * place *.pc file in $out/lib/pkgconfig/ (instead of
   $out/share/pkgconfig/ which doesn't work)
 * prefix commit message with "libid3tag:"
]
---
 .../libraries/libid3tag/default.nix           | 24 +++++--------------
 .../development/libraries/libid3tag/id3tag.pc | 11 +++++++++
 2 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/libraries/libid3tag/id3tag.pc

diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index a173cee2f264..4cc2f65440ca 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -14,24 +14,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./debian-patches.patch ];
 
-  postInstall = let pkgconfigFile = writeText "id3tag.pc" ''
-    prefix=@out@
-    exec_prefix=''${prefix}
-    libdir=''${exec_prefix}/lib
-    includedir=''${exec_prefix}/include
-
-    Name: libid3tag
-    Description: ID3 tag manipulation library
-    Version: ${version}
-
-    Libs: -L''${libdir} -lid3tag
-    Cflags: -I''${includedir}
-    '';
-  in ''
-      ensureDir $out/share/pkgconfig
-      cp ${pkgconfigFile} $out/share/pkgconfig/id3tag.pc
-      substituteInPlace $out/share/pkgconfig/id3tag.pc \
-        --subst-var-by out $out
+  postInstall = ''
+    mkdir -p $out/lib/pkgconfig
+    cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc
+    substituteInPlace $out/lib/pkgconfig/id3tag.pc \
+      --subst-var-by out $out \
+      --subst-var-by version "${version}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc
new file mode 100644
index 000000000000..854f1783cae5
--- /dev/null
+++ b/pkgs/development/libraries/libid3tag/id3tag.pc
@@ -0,0 +1,11 @@
+prefix=@out@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libid3tag
+Description: ID3 tag manipulation library
+Version: @version@
+
+Libs: -L${libdir} -lid3tag
+Cflags: -I${includedir}

From 367718a80f100d9ec34186763edb57f8f0b99e1c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 3 Aug 2014 16:33:19 +0200
Subject: [PATCH 008/107] libxkbcommon: Update to version 0.4.2.

Fixes build of i3lock and to possibly prevent breakage of other
packages, I've tested building of gtk3 and qt5 (partial, core2duo here).
I know it's not a comprehensive test but we can still revert in case
Hydra reports more builds failing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/libxkbcommon/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index e7923f3df5bc..e5682219dba1 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config }:
+{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "libxkbcommon-0.3.1";
+  name = "libxkbcommon-0.4.2";
 
   src = fetchurl {
     url = "http://xkbcommon.org/download/${name}.tar.xz";
-    sha256 = "13mk335r4dhi9qglzbp46ina1wz4qgcp8r7s06iq7j50pf0kb5ww";
+    sha256 = "0mw9ljc5fbqbhnm884w7ns5pf6f2rqj9ww5xcaps9nzdgsq73z50";
   };
 
-  buildInputs = [ pkgconfig yacc flex xkeyboard_config ];
+  buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
 
   configureFlags = ''
     --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb

From 10f9730d64329772d720d1f2b5e728f3db7d0f6a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 20:35:51 +0400
Subject: [PATCH 009/107] Update compiz

---
 pkgs/applications/window-managers/compiz/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 02b7b9987bdb..b73d636aaa58 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -15,11 +15,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="compiz";
-    version="0.9.10.0";
+    version="0.9.11.2";
     name="${baseName}-${version}";
-    hash="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax";
-    url="https://launchpad.net/compiz/0.9.10/0.9.10.0/+download/compiz-0.9.10.0.tar.bz2";
-    sha256="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax";
+    hash="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy";
+    url="https://launchpad.net/compiz/0.9.11/0.9.11.2/+download/compiz-0.9.11.2.tar.bz2";
+    sha256="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy";
   };
   buildInputs = [cmake pkgconfig
     libXrender renderproto gtk libwnck pango cairo

From 399c5285ec3c594274f97b395d6609bad83d0d1c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 20:36:35 +0400
Subject: [PATCH 010/107] Update Angelscript

---
 pkgs/development/interpreters/angelscript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index 871101ba03e0..1167f121e624 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="angelscript";
-    version = "2.29.0";
+    version = "2.29.1";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "1g0bi8dx832s3911rr3jymnffaz3q7cnbzl53nmi6hwsr2kpc6mx";
+    sha256 = "081a0wnn1hl0hjgrg0nz63ff7k7dgrwsgszka5i7623ny407fkl5";
   };
 in
 rec {

From 9695af7d47fc0f181ec8e057bd26a786f740813a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 20:38:03 +0400
Subject: [PATCH 011/107] Update libSodium cryptography library

---
 pkgs/development/libraries/sodium/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix
index 93f2ff0de6b6..be52725f2c8f 100644
--- a/pkgs/development/libraries/sodium/default.nix
+++ b/pkgs/development/libraries/sodium/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="sodium";
-    version="0.5.0";
+    version="0.6.1";
     name="${baseName}-${version}";
-    hash="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w";
-    url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.5.0.tar.gz";
-    sha256="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w";
+    hash="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04";
+    url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.6.1.tar.gz";
+    sha256="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04";
   };
   buildInputs = [
   ];

From 4c176fd76ed0c6dc59411b080f56b3aff7ed0bd4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 20:44:33 +0400
Subject: [PATCH 012/107] Update Scons build manager

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

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index 75d72e3d52a0..93f7699481c8 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
 
 let
   name = "scons";
-  version = "2.3.1";
+  version = "2.3.2";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "00822ax62cfi2fvz9zhw80hl1273524d97xfycq4q276z1lb86h9";
+    sha256 = "1m29lhwz7p6k4f8wc8qjpwa89058lzq3vrycgxbfc5cmbq6354zr";
   };
 
   buildInputs = [python makeWrapper];

From 20028936abdd12951629563232df59d6c98eb45c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 20:46:18 +0400
Subject: [PATCH 013/107] Update ZPAQ

---
 pkgs/tools/archivers/zpaq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 718a80e1406a..1ed5866a6920 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="652";
+    version="655";
     name="${baseName}-${version}";
-    hash="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky";
-    url="http://mattmahoney.net/dc/zpaq652.zip";
-    sha256="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky";
+    hash="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c";
+    url="http://mattmahoney.net/dc/zpaq655.zip";
+    sha256="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c";
   };
   buildInputs = [
     unzip

From 619c368f54820d040e74dca8541f40455fdfcb0a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 20:53:00 +0400
Subject: [PATCH 014/107] Update Sysdig system tracing tool

---
 pkgs/os-specific/linux/sysdig/default.nix      | 5 +++--
 pkgs/os-specific/linux/sysdig/default.upstream | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 10a1d88f2347..e9b533f66876 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,10 +3,10 @@ let
   inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version="0.1.83";
+    version = "0.1.86";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256="0d4fw6vba78hqy8plhcq8lkdcxy1fizrr5aiszdsap7cvd0gls6r";
+    sha256 = "1bb5whzxmbzr21fxirymhznkgdx01rsqzxd2dlnqvhbf8x2dpzw3";
   };
   buildInputs = [
     cmake zlib luajit
@@ -38,5 +38,6 @@ stdenv.mkDerivation {
     license = licenses.gpl2;
     maintainers = [maintainers.raskin];
     platforms = platforms.linux ++ platforms.darwin;
+    downloadPage = "https://github.com/draios/sysdig/releases";
   };
 }
diff --git a/pkgs/os-specific/linux/sysdig/default.upstream b/pkgs/os-specific/linux/sysdig/default.upstream
index 7071d9825007..485de5741d79 100644
--- a/pkgs/os-specific/linux/sysdig/default.upstream
+++ b/pkgs/os-specific/linux/sysdig/default.upstream
@@ -1,3 +1,8 @@
 url https://github.com/draios/sysdig/releases
 ensure_choice
 version '.*/([0-9.]+)[.]tar[.].*' '\1'
+do_overwrite () {
+  ensure_hash
+  set_var_value sha256 $CURRENT_HASH
+  set_var_value version $CURRENT_VERSION
+}

From 06ee6a2dab04ce2fef4b64c2e5482041bb2f956f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 20:54:31 +0400
Subject: [PATCH 015/107] Update GNU Chess chess engine

---
 pkgs/games/gnuchess/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index 72270cc312a2..90a4a069c2ae 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="gnuchess";
-    version="6.1.1";
+    version="6.1.2";
     name="${baseName}-${version}";
-    hash="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn";
-    url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.1.tar.gz";
-    sha256="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn";
+    hash="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l";
+    url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.2.tar.gz";
+    sha256="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l";
   };
   buildInputs = [
     flex

From 1fa783f55a6259c300b87762f7b8786fe1645800 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 22:02:29 +0400
Subject: [PATCH 016/107] Update glusterfs

---
 pkgs/tools/filesystems/glusterfs/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 1c843a666360..69f3f7ef1efd 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -4,10 +4,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.5.0";
+    version="3.5.2";
     name="${baseName}-${version}";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz";
-    sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir";
+    hash="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.2/glusterfs-3.5.2.tar.gz";
+    sha256="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline

From 750a5f4e0cedc414826c10db24f84c72c03a143e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 22:02:52 +0400
Subject: [PATCH 017/107] Update Wine-unstable

---
 pkgs/misc/emulators/wine/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index 0e19d6ab8932..bcfc1600be40 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
 let
-    version = "1.7.20";
+    version = "1.7.23";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "05azpxrl7364ckvkwy7aa2p0vb4qhbc6wcn2l8khqb92jq5inhww";
+      sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v";
     };
 
     gecko = fetchurl {

From 09b3fd0eb280b4157bc5eb0e28e9304ca383df41 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 22:18:53 +0400
Subject: [PATCH 018/107] Update SBCL Common Lisp compiler

---
 pkgs/development/compilers/sbcl/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 579d5ec11eb9..6872fee846f3 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,14 +2,17 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.0";
+  version = "1.2.2";
 
   src = fetchurl {
-    url    = mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2;
-    sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
+    url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
+    sha256 = "08jk1bjk7087gq4ibzs1d27r0c6pigbvmff351j9a03kvl652b2v";
   };
 
-  buildInputs = [ sbclBootstrap ] ++ stdenv.lib.optional stdenv.isLinux clisp;
+  buildInputs = [ ]
+    ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap)
+    ++ (stdenv.lib.optional stdenv.isLinux clisp)
+    ;
 
   patchPhase = ''
     echo '"${version}.nixos"' > version.lisp-expr
@@ -70,5 +73,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
+    inherit version;
+    updateWalker = true;
   };
 }

From 0ca8dfe8052b03eb53f24ee19472c54ce3c6439b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2014 22:19:27 +0400
Subject: [PATCH 019/107] Remove SBCL updater file: home page allows automatic
 updates

---
 pkgs/development/compilers/sbcl/default.upstream | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 pkgs/development/compilers/sbcl/default.upstream

diff --git a/pkgs/development/compilers/sbcl/default.upstream b/pkgs/development/compilers/sbcl/default.upstream
deleted file mode 100644
index de69a2828c61..000000000000
--- a/pkgs/development/compilers/sbcl/default.upstream
+++ /dev/null
@@ -1,9 +0,0 @@
-name sbcl
-target default.nix
-url http://sf.net/projects/sbcl/files/sbcl/
-version_link '/sbcl/[0-9.]+/$'
-link "source.tar.bz2"
-version '.*/sbcl-([0-9.]+)-source.*' '\1'
-redirect
-process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/'
-process '[?].*' ''

From 34890e7c2a825d0d43dc4d6d070d706181ae8374 Mon Sep 17 00:00:00 2001
From: Chris Farmiloe <chrisfarms@gmail.com>
Date: Tue, 20 May 2014 10:50:39 +0100
Subject: [PATCH 020/107] nixos: Add enablePHP convinence option to
 services.httpd module to mimic subservices option

Fixes #2699
---
 .../modules/services/web-servers/apache-httpd/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 6d0416fbb155..eb3cb75b658e 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -387,7 +387,7 @@ let
   '';
 
 
-  enablePHP = any (svc: svc.enablePHP) allSubservices;
+  enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices;
 
 
   # Generate the PHP configuration file.  Should probably be factored
@@ -531,6 +531,12 @@ in
         '';
       };
 
+      enablePHP = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the PHP module.";
+      };
+
       phpOptions = mkOption {
         type = types.lines;
         default = "";

From 4b052cb8469d98b568c8580cdab90069912fa168 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 3 Aug 2014 21:33:37 +0200
Subject: [PATCH 021/107] zathura: preBuild phase not needed in latest zathura

---
 pkgs/applications/misc/zathura/core/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 5cffbe965bbb..5f44f79ebcdd 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -11,13 +11,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
 
-  # Bug in zathura build system: we should remove empty manfiles in order them
-  # to be compiled properly
-  preBuild = ''
-    rm zathura.1
-    rm zathurarc.5
-  '';
-
   makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
 
   postInstall = ''

From d8fa02b508fd5fa0ce375bafced4df5c33be1976 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 3 Aug 2014 21:46:36 +0200
Subject: [PATCH 022/107] synergy: update to 1.5.0

---
 pkgs/applications/misc/synergy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 834b514148b6..4e0efc5f3e5f 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -6,11 +6,11 @@ assert stdenv.isLinux -> cryptopp != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "synergy-1.4.17";
+  name = "synergy-1.5.0";
 
   src = fetchurl {
-    url = "http://fossfiles.com/synergy/${name}-r2055-Source.tar.gz";
-    sha256 = "1mwaapvq9vsm0rdpq99fyzcw6wbp83rg6cylcqcgjjd21c6y9iwm";
+    url = "http://synergy-project.org/files/packages/synergy-1.5.0-r2278-Source.tar.gz";
+    sha256 = "097hk9v01lwzs7ly6ynadxmjh7ad68l5si7w4qmjn6z7l8b61gv6";
   };
 
   patches = optional stdenv.isLinux ./cryptopp.patch;

From 65949e7415adc3c49d24a56b70dfcd06e1fd7736 Mon Sep 17 00:00:00 2001
From: cbpark <cbpark@gmail.com>
Date: Mon, 4 Aug 2014 00:58:17 +0200
Subject: [PATCH 023/107] Add haskell-probability

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

diff --git a/pkgs/development/libraries/haskell/probability/default.nix b/pkgs/development/libraries/haskell/probability/default.nix
new file mode 100644
index 000000000000..bada700ca3d3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/probability/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, random, transformers, utilityHt }:
+
+cabal.mkDerivation (self: {
+  pname = "probability";
+  version = "0.2.4.1";
+  sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc";
+  buildDepends = [ random transformers utilityHt ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming";
+    description = "Probabilistic Functional Programming";
+    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 11102c27a590..49f3e1a07c7e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1867,6 +1867,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {};
   primitive = self.primitive_0_5_3_0;
 
+  probability = callPackage ../development/libraries/haskell/probability {};
+
   profunctors = callPackage ../development/libraries/haskell/profunctors {};
 
   profunctorExtras = callPackage ../development/libraries/haskell/profunctor-extras {};

From 8f3d2b740bebfb0efb3ee4773a068b296015f3d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Aug 2014 01:08:48 +0200
Subject: [PATCH 024/107] wine: Update to 1.7.23

---
 pkgs/misc/emulators/wine/unstable.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index bcfc1600be40..cd5c5a8b4790 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -16,18 +16,18 @@ let
     };
 
     gecko = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi";
-      sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh";
+      url = "mirror://sourceforge/wine/wine_gecko-2.24-x86.msi";
+      sha256 = "0b10f55q3sldlcywscdlw3kd7vl9izlazw7jx30y4rpahypaqf3f";
     };
 
     gecko64 = fetchurl {
-      url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi";
-      sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw";
+      url = "mirror://sourceforge/wine/wine_gecko-2.24-x86_64.msi";
+      sha256 = "1j4wdlhzvjrabzr9igcnx0ivm5mcb8kp7bwkpfpfsanbifk7sma7";
     };
 
     mono = fetchurl {
-      url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi";
-      sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x";
+      url = "mirror://sourceforge/wine/wine-mono-4.5.2.msi";
+      sha256 = "1bgasysf3qacxgh5rlk7qlw47ar5zgd1k9gb22pihi5s87dlw4nr";
     };
 
 in stdenv.mkDerivation rec {

From 4834717507640831a3770cb8b946d26d6fbdc49f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 4 Aug 2014 02:38:03 +0200
Subject: [PATCH 025/107] linux-kernel: Add new upstream version 3.16.

Also set linux_latest to it as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/kernel/linux-3.16.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix              | 14 ++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-3.16.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.16.nix b/pkgs/os-specific/linux/kernel/linux-3.16.nix
new file mode 100644
index 000000000000..3a7e51a080e5
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.16.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "3.16";
+  modDirVersion = "3.16.0";
+  extraMeta.branch = "3.16";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "183p3pz2rfprbp5i4kwk90kjn90v40banwx8759jxnd74xwss4s8";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7626338db00e..7cbee0a724ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7373,6 +7373,15 @@ let
       ];
   };
 
+  linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@@ -7508,8 +7517,8 @@ let
   linuxPackages = linuxPackages_3_12;
 
   # Update this when adding the newest kernel major version!
-  linux_latest = pkgs.linux_3_15;
-  linuxPackages_latest = pkgs.linuxPackages_3_15;
+  linux_latest = pkgs.linux_3_16;
+  linuxPackages_latest = pkgs.linuxPackages_3_16;
 
   # Build the kernel modules for the some of the kernels.
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
@@ -7521,6 +7530,7 @@ let
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
   linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
   linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15);
+  linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
 
   # grsecurity flavors

From 26440f41fb6072a11d1aeeee870179747e064d61 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 4 Aug 2014 04:07:23 +0200
Subject: [PATCH 026/107] chromium: Update beta and dev to latest versions.

beta: 37.0.2062.44 -> 37.0.2062.58 (builds fine, tested)
dev:  38.0.2101.0  -> 38.0.2107.3  (builds fine, tested)

Drop patch for fixing angle build for the dev version, because it was
applied upstream already.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../chromium/source/angle_build_37.patch      | 347 ------------------
 .../browsers/chromium/source/default.nix      |   6 +-
 .../browsers/chromium/source/sources.nix      |  16 +-
 3 files changed, 10 insertions(+), 359 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch b/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch
deleted file mode 100644
index a3e8c91174a4..000000000000
--- a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-commit 9c4b24a52e0ff478aa170d33e26c44acd8c68be3
-Author: Jamie Madill <jmadill@chromium.org>
-Date:   Thu Jun 12 13:41:17 2014 -0400
-
-    Use commit_id.py on Windows, and handle missing git.
-    
-    This allows us to delete the Windows batch file.
-    
-    Changes the commit_id script to take the working directory so that it
-    can be called from a different working directory than the angle
-    repository is in.
-    
-    Renames the generated commit header to angle_commit.h. This is being
-    written to the shared generated code directory for the entire build,
-    and "commit.h" is insufficiently unique.
-    
-    BUG=angle:669
-    
-    Change-Id: I35e80411a7e8ba1e02ce3f6a4fc54ed4dbc918f3
-    Reviewed-on: https://chromium-review.googlesource.com/202048
-    Reviewed-by: Geoff Lang <geofflang@chromium.org>
-    Tested-by: Jamie Madill <jmadill@chromium.org>
-    [Removed and/or fixed up Windows specific hunks]
-    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-
-diff --git a/generate_projects b/generate_projects
-index 6743254..8175277 100644
---- a/generate_projects
-+++ b/generate_projects
-@@ -34,6 +34,7 @@ if __name__ == '__main__':
-     gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0')
-     gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0')
-     gyp_cmd += ' -D release_symbols=' + ('true' if release_symbols else 'false')
-+    gyp_cmd += ' -D angle_use_commit_id=0'
-     gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp')
- 
-     print 'Generating projects to ' + generation_dir + ' from gyp files...'
-diff --git a/projects/build/all.sln b/projects/build/all.sln
-index 1aa0796..5862edd 100644
---- a/projects/build/all.sln
-+++ b/projects/build/all.sln
-@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}"
- 	ProjectSection(ProjectDependencies) = postProject
- 		{63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
--		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
- 		{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
- 		{276D20F5-2943-414C-0FF6-21F4723A5CF6} = {276D20F5-2943-414C-0FF6-21F4723A5CF6}
- 		{C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679}
- 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5}
-+		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
- 		{22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81}
- 		{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
- 		{FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061}
-@@ -30,9 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048
- 	EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}"
--	ProjectSection(ProjectDependencies) = postProject
--		{63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
--	EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}"
- 	ProjectSection(ProjectDependencies) = postProject
-@@ -68,7 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx
- 	ProjectSection(ProjectDependencies) = postProject
- 		{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
- 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
--		{63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
- 	EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}"
-diff --git a/projects/samples/samples.sln b/projects/samples/samples.sln
-index 53cec34..b927860 100644
---- a/projects/samples/samples.sln
-+++ b/projects/samples/samples.sln
-@@ -1,9 +1,6 @@
- Microsoft Visual Studio Solution File, Format Version 11.00
- # Visual C++ Express 2010
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}"
--	ProjectSection(ProjectDependencies) = postProject
--		{63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
--	EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}"
- 	ProjectSection(ProjectDependencies) = postProject
-@@ -39,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx
- 	ProjectSection(ProjectDependencies) = postProject
- 		{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
- 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
--		{63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
- 	EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}"
-diff --git a/projects/src/angle.sln b/projects/src/angle.sln
-index 0d6ec65..cdf9f53 100644
---- a/projects/src/angle.sln
-+++ b/projects/src/angle.sln
-@@ -1,9 +1,6 @@
- Microsoft Visual Studio Solution File, Format Version 11.00
- # Visual C++ Express 2010
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}"
--	ProjectSection(ProjectDependencies) = postProject
--		{63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
--	EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}"
- 	ProjectSection(ProjectDependencies) = postProject
-@@ -16,7 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj",
- 	ProjectSection(ProjectDependencies) = postProject
- 		{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
- 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
--		{63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817}
- 	EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}"
-diff --git a/src/angle.gypi b/src/angle.gypi
-index 5339369..ef16749 100644
---- a/src/angle.gypi
-+++ b/src/angle.gypi
-@@ -7,6 +7,12 @@
-     {
-         'angle_code': 1,
-         'angle_post_build_script%': 0,
-+        'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle',
-+        'angle_id_script_base': 'commit_id.py',
-+        'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)',
-+        'angle_id_header_base': 'commit.h',
-+        'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)',
-+        'angle_use_commit_id%': '<!(python <(angle_id_script_base) check ..)',
-     },
-     'includes':
-     [
-@@ -23,57 +29,71 @@
-             'copies':
-             [
-                 {
--                    'destination': '<(SHARED_INTERMEDIATE_DIR)',
--                    'files': [ 'commit_id.bat', 'copy_compiler_dll.bat', 'commit_id.py' ],
-+                    'destination': '<(angle_gen_path)',
-+                    'files': [ 'copy_compiler_dll.bat', '<(angle_id_script_base)' ],
-                 },
-             ],
-         },
--
-+    ],
-+    'conditions':
-+    [
-+        ['angle_use_commit_id!=0',
-         {
--            'target_name': 'commit_id',
--            'type': 'none',
--            'includes': [ '../build/common_defines.gypi', ],
--            'dependencies': [ 'copy_scripts', ],
--            'conditions':
-+            'targets':
-             [
--                ['OS=="win"',
-                 {
-+                    'target_name': 'commit_id',
-+                    'type': 'none',
-+                    'includes': [ '../build/common_defines.gypi', ],
-+                    'dependencies': [ 'copy_scripts', ],
-                     'actions':
-                     [
-                         {
--                            'action_name': 'Generate Commit ID Header',
--                            'message': 'Generating commit ID header...',
-+                            'action_name': 'Generate ANGLE Commit ID Header',
-+                            'message': 'Generating ANGLE Commit ID',
-+                            # reference the git index as an input, so we rebuild on changes to the index
-+                            'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
-+                            'outputs': [ '<(angle_id_header)' ],
-                             'msvs_cygwin_shell': 0,
--                            'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.bat', '<(angle_path)/.git/index' ],
--                            'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit.h' ],
--                            'action': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.bat', '<(SHARED_INTERMEDIATE_DIR)' ],
-+                            'action':
-+                            [
-+                                'python', '<(angle_id_script)', 'gen', '<(angle_path)', '<(angle_id_header)'
-+                            ],
-                         },
-                     ],
--                },
--                { # OS != win
--                    'actions':
-+                    'direct_dependent_settings':
-+                    {
-+                        'include_dirs':
-+                        [
-+                            '<(angle_gen_path)',
-+                        ],
-+                    },
-+                }
-+            ]
-+        },
-+        { # angle_use_commit_id==0
-+            'targets':
-+            [
-+                {
-+                    'target_name': 'commit_id',
-+                    'type': 'none',
-+                    'copies':
-                     [
-                         {
--                            'action_name': 'Generate Commit ID Header',
--                            'message': 'Generating commit ID header...',
--                            'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(angle_path)/.git/index' ],
--                            'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/commit.h' ],
--                            'action': [ 'python', '<(SHARED_INTERMEDIATE_DIR)/commit_id.py', '<(SHARED_INTERMEDIATE_DIR)/commit.h' ],
--                        },
-+                            'destination': '<(angle_gen_path)/id',
-+                            'files': [ '<(angle_id_header_base)' ]
-+                        }
-                     ],
--                }],
--            ],
--            'direct_dependent_settings':
--            {
--                'include_dirs':
--                [
--                    '<(SHARED_INTERMEDIATE_DIR)',
--                ],
--            },
--        },
--    ],
--    'conditions':
--    [
-+                    'direct_dependent_settings':
-+                    {
-+                        'include_dirs':
-+                        [
-+                            '<(angle_gen_path)',
-+                        ],
-+                    },
-+                }
-+            ]
-+        }],
-         ['OS=="win"',
-         {
-             'targets':
-@@ -93,7 +113,7 @@
-                             'outputs': [ '<(PRODUCT_DIR)/D3DCompiler_46.dll' ],
-                             'action':
-                             [
--                                "<(SHARED_INTERMEDIATE_DIR)/copy_compiler_dll.bat",
-+                                "<(angle_gen_path)/copy_compiler_dll.bat",
-                                 "$(PlatformName)",
-                                 "<(windows_sdk_path)",
-                                 "<(PRODUCT_DIR)"
-diff --git a/src/commit.h b/src/commit.h
-new file mode 100644
-index 0000000..4c89a65
---- /dev/null
-+++ b/src/commit.h
-@@ -0,0 +1,14 @@
-+//
-+// Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+//
-+// commit.h:
-+//   This is a default commit hash header, when git is not available.
-+//
-+
-+#define ANGLE_COMMIT_HASH "unknown hash"
-+#define ANGLE_COMMIT_HASH_SIZE 12
-+#define ANGLE_COMMIT_DATE "unknown date"
-+
-+#define ANGLE_DISABLE_PROGRAM_BINARY_LOAD
-diff --git a/src/commit_id.py b/src/commit_id.py
-index 6339cca..7f711e7 100644
---- a/src/commit_id.py
-+++ b/src/commit_id.py
-@@ -1,19 +1,35 @@
- import subprocess as sp
- import sys
-+import os
- 
--def grab_output(*command):
--    return sp.Popen(command, stdout=sp.PIPE).communicate()[0].strip()
-+# Usage: commit_id.py check <angle_dir> (checks if git is present)
-+# Usage: commit_id.py gen <angle_dir> <file_to_write> (generates commit id)
- 
-+def grab_output(command, cwd):
-+    return sp.Popen(command, stdout=sp.PIPE, shell=True, cwd=cwd).communicate()[0].strip()
-+
-+operation = sys.argv[1]
-+cwd = sys.argv[2]
-+
-+if operation == 'check':
-+    index_path = os.path.join(cwd, '.git', 'index')
-+    if os.path.exists(index_path):
-+        print("1")
-+    else:
-+        print("0")
-+    sys.exit(0)
-+
-+output_file = sys.argv[3]
- commit_id_size = 12
- 
- try:
--    commit_id = grab_output('git', 'rev-parse', '--short=%d' % commit_id_size, 'HEAD')
--    commit_date = grab_output('git', 'show', '-s', '--format=%ci', 'HEAD')
-+    commit_id = grab_output('git rev-parse --short=%d HEAD' % commit_id_size, cwd)
-+    commit_date = grab_output('git show -s --format=%ci HEAD', cwd)
- except:
-     commit_id = 'invalid-hash'
-     commit_date = 'invalid-date'
- 
--hfile = open(sys.argv[1], 'w')
-+hfile = open(output_file, 'w')
- 
- hfile.write('#define ANGLE_COMMIT_HASH "%s"\n'    % commit_id)
- hfile.write('#define ANGLE_COMMIT_HASH_SIZE %d\n' % commit_id_size)
-diff --git a/src/common/version.h b/src/common/version.h
-index b9781d7..d9148d1 100644
---- a/src/common/version.h
-+++ b/src/common/version.h
-@@ -1,4 +1,4 @@
--#include "commit.h"
-+#include "id/commit.h"
- 
- #define ANGLE_MAJOR_VERSION 2
- #define ANGLE_MINOR_VERSION 1
-diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
-index 8525ffb..e3ffa47 100644
---- a/src/libGLESv2/ProgramBinary.cpp
-+++ b/src/libGLESv2/ProgramBinary.cpp
-@@ -1018,6 +1018,9 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, FragmentShader *fragmentShade
- 
- bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length)
- {
-+#ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD
-+    return false;
-+#else
-     BinaryInputStream stream(binary, length);
- 
-     int format = stream.readInt<int>();
-@@ -1260,6 +1263,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length)
-     initializeUniformStorage();
- 
-     return true;
-+#endif // #ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD
- }
- 
- bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length)
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 70b01d071a78..c075cc36f166 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -30,14 +30,12 @@ stdenv.mkDerivation {
       -e 's|/bin/echo|echo|' \
       -e "/python_arch/s/: *'[^']*'/: '""'/" \
       build/common.gypi chrome/chrome_tests.gypi
-  '' + optionalString (versionOlder version "38.0.0.0") (''
+  '' + optionalString (versionOlder version "38.0.0.0") ''
     sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium
     sed -i -e 's|/usr/bin/gcc|gcc|' \
       third_party/WebKit/Source/build/scripts/scripts.gypi \
       third_party/WebKit/Source/build/scripts/preprocessor.pm
-  '' + optionalString (!versionOlder version "37.0.0.0") ''
-    patch -p1 -d third_party/angle < "${./angle_build_37.patch}"
-  '') + optionalString useOpenSSL ''
+  '' + optionalString useOpenSSL ''
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
   '';
 
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 294577aa5594..4a610827913f 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,16 +1,16 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "38.0.2101.0";
-    sha256 = "01lmnw6kf7qahifybpcf7275ilbsdz1mg10lckh9jhbqk4mxy4c4";
-    sha256bin32 = "06grj03bvkgfmr5gfhv5gqn9vrz0r37svp5wr0l7d2iav7vk7g9g";
-    sha256bin64 = "0d856xkjpx1pcwrkfqa40kwy3s1nvc2qksvrvvdfb84fg3gc4j42";
+    version = "38.0.2107.3";
+    sha256 = "0zb1mj3xgvvs5ijix4b52vj9dlymqkipn8srfzvhwl7g4hx5ss3v";
+    sha256bin32 = "12lvvmg3bqacb0qw72bwlxm2m57s39mz2810agngdgzv0hd835cv";
+    sha256bin64 = "1vw36s8nlvdsl8pjbh4gny00kvcizn1i2lznzqzysicz2rz7ncrh";
   };
   beta = {
-    version = "37.0.2062.44";
-    sha256 = "0pvwdrwygn236bg8wdambwkw9iglq0a3lm8sr7k3q02ng5v0l111";
-    sha256bin32 = "1j326kgng245b1lf5dlg0ipwbrm7miiz5byhisqls30v1q3njka9";
-    sha256bin64 = "1w86salg04z42c518v6nn40003zhabk33plrz5zh9nfjdxn6nxig";
+    version = "37.0.2062.58";
+    sha256 = "0jck4s6nrizj9wmifsjviin9ifnviihs21fi05wzljyfnbgc4byl";
+    sha256bin32 = "1cm1r8bqy66gvdhbrgn9pdc11i72dca96ab5j3m3349p6728jbgk";
+    sha256bin64 = "0cpb189pn5jiplldkgy8lfbcwvfik66kjjf6y2i708xa5ggfpwfi";
   };
   stable = {
     version = "36.0.1985.125";

From f40fc0624d22dd4dc5c7e0ec99ec611be33c9d41 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 4 Aug 2014 07:21:27 +0200
Subject: [PATCH 027/107] haskell/yi: Build against vty 4.7.5.

Probably jailbreak would do as well, but the version constraints are:

vty >= 4.7.4 && <5

I suppose the upcoming release of Yi will fix this, so I'm not using
jailbreak here (apart from the fact that Yi doesn't build successfully
using VTY >= 5).

Thanks to @bb010g for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 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 11102c27a590..8aadcc0a467b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2887,7 +2887,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   taffybar = callPackage ../applications/misc/taffybar {};
 
-  yi = callPackage ../applications/editors/yi/yi.nix {};
+  yi = callPackage ../applications/editors/yi/yi.nix {
+    vty = self.vty_4_7_5;
+  };
 
   yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {};
 

From ba6c76f264066dfaeb0c0ecd3b5dab571f63bd13 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 4 Aug 2014 10:11:52 +0200
Subject: [PATCH 028/107] pythonPackage.gunicorn: update to 19.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 066821a71f37..31f0875b5f27 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3593,11 +3593,11 @@ rec {
   };
 
   gunicorn = buildPythonPackage rec {
-    name = "gunicorn-18.0";
+    name = "gunicorn-19.1.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz";
-      md5 = "c7138b9ac7515a42066922d2b6120fbe";
+      md5 = "3d759bec3c46a680ff010775258c4c56";
     };
 
     buildInputs = [ pytest ];

From bffdf03e4fab412b6e4a1e5497349f89a194f07f Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 4 Aug 2014 11:23:25 +0200
Subject: [PATCH 029/107] Support app names with white spaces

---
 pkgs/development/mobile/xcodeenv/build-app.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index 92e68f1bda70..1b4940b0c3d9 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
         ${stdenv.lib.optionalString enableWirelessDistribution ''
           appname=$(basename $out/*.ipa .ipa)
           sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&amp;version=${version}\&amp;title=$appname|" ${./install.html.template} > $out/$appname.html
-          echo "doc install $out/$appname.html" >> $out/nix-support/hydra-build-products
+          echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
         ''}
       ''}
       

From 7eb93f944b3c3f57369d9efdba0c8eef8f89e866 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 4 Aug 2014 11:26:14 +0200
Subject: [PATCH 030/107] Implemented wireless adhoc distribution support for
 titanium apps

---
 pkgs/development/mobile/titaniumenv/build-app.nix     | 11 +++++++++++
 .../mobile/titaniumenv/examples/default.nix           |  2 ++
 .../titaniumenv/examples/kitchensink/default.nix      |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 2443bfe9aed8..fa959035a9e9 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -2,10 +2,12 @@
 { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
 , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null
+, enableWirelessDistribution ? false, installURL ? null
 }:
 
 assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
 assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null;
+assert enableWirelessDistribution -> installURL != null;
 
 let
   androidsdkComposition = androidsdk {
@@ -132,6 +134,15 @@ stdenv.mkDerivation {
              cp -av build/iphone/build/* $out
              mkdir -p $out/nix-support
              echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
+             
+             ${stdenv.lib.optionalString enableWirelessDistribution ''
+               appname=$(basename $out/Release-iphoneos/*.ipa .ipa)
+               bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
+               version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
+               
+               sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > $out/$appname.html
+               echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
+             ''}
            ''
         else if target == "iphone" then ""
         else throw "Target: ${target} is not supported!"}
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index e5b439364535..d595db408178 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -5,6 +5,7 @@
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
 , allowUnfree ? false
+, enableWirelessDistribution ? false, installURL ? null
 }:
 
 let
@@ -90,6 +91,7 @@ rec {
       release = true;
       rename = true;
       inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword;
+      inherit enableWirelessDistribution installURL;
     };
   }
   
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 1725c826a52a..953726709694 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -1,5 +1,6 @@
 { titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false
 , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null
+, enableWirelessDistribution ? false, installURL ? null
 }:
 
 assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioningProfile != null && iosCertificate != null && iosCertificateName != null && iosCertificatePassword != null);
@@ -37,4 +38,5 @@ titaniumenv.buildApp {
   androidKeyStorePassword = "mykeystore";
   
   inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword;
+  inherit enableWirelessDistribution installURL;
 }

From ced7fc37c268e40e2c267fd2f1ad694b40f762e7 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 4 Aug 2014 11:29:51 +0200
Subject: [PATCH 031/107] virtualbox-image: Make the image size configurable

---
 .../virtualisation/virtualbox-image.nix       | 228 ++++++++++--------
 1 file changed, 124 insertions(+), 104 deletions(-)

diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 2e30f4c62f97..f7c350f92216 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -2,112 +2,132 @@
 
 with lib;
 
-{
-  system.build.virtualBoxImage =
-    pkgs.vmTools.runInLinuxVM (
-      pkgs.runCommand "virtualbox-image"
-        { memSize = 768;
-          preVM =
-            ''
-              mkdir $out
-              diskImage=$out/image
-              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "10G"
-              mv closure xchg/
-            '';
-          postVM =
-            ''
-              echo "creating VirtualBox disk image..."
-              ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi
-              rm $diskImage
-            '';
-          buildInputs = [ pkgs.utillinux pkgs.perl ];
-          exportReferencesGraph =
-            [ "closure" config.system.build.toplevel ];
-        }
-        ''
-          # Create a single / partition.
-          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
-          ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
-          . /sys/class/block/vda1/uevent
-          mknod /dev/vda1 b $MAJOR $MINOR
+let
 
-          # Create an empty filesystem and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
-          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
-          mkdir /mnt
-          mount /dev/vda1 /mnt
+  cfg = config.virtualbox;
 
-          # The initrd expects these directories to exist.
-          mkdir /mnt/dev /mnt/proc /mnt/sys
-          mount --bind /proc /mnt/proc
-          mount --bind /dev /mnt/dev
-          mount --bind /sys /mnt/sys
+in {
 
-          # Copy all paths in the closure to the filesystem.
-          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+  options = {
+    virtualbox = {
+      baseImageSize = mkOption {
+        type = types.str;
+        default = 10G;
+        description = ''
+          The size of the VirtualBox base image. The size string should be on
+          a format the qemu-img command accepts.
+        '';
+      };
+    };
+  };
 
-          echo "filling Nix store..."
-          mkdir -p /mnt/nix/store
-          set -f
-          cp -prd $storePaths /mnt/nix/store/
-
-          mkdir -p /mnt/etc/nix
-          echo 'build-users-group = ' > /mnt/etc/nix/nix.conf
-
-          # Register the paths in the Nix database.
-          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package}/bin/nix-store --load-db
-
-          # Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
-
-          # `nixos-rebuild' requires an /etc/NIXOS.
-          mkdir -p /mnt/etc/nixos
-          touch /mnt/etc/NIXOS
-
-          # `switch-to-configuration' requires a /bin/sh
-          mkdir -p /mnt/bin
-          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
-
-          # Generate the GRUB menu.
-          ln -s vda /dev/sda
-          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
-
-          umount /mnt/proc /mnt/dev /mnt/sys
-          umount /mnt
-        ''
-    );
-
-  system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova"
-    { buildInputs = [ pkgs.linuxPackages.virtualbox ];
-      vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})";
-      fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
-    }
-    ''
-      echo "creating VirtualBox VM..."
-      export HOME=$PWD
-      VBoxManage createvm --name "$vmName" --register \
-        --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
-      VBoxManage modifyvm "$vmName" \
-        --memory 1536 --acpi on --vram 10 \
-        --nictype1 virtio --nic1 nat \
-        --audiocontroller ac97 --audio alsa \
-        --rtcuseutc on \
-        --usb on --mouse usbtablet
-      VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
-      VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
-        --medium ${config.system.build.virtualBoxImage}/disk.vdi
-
-      echo "exporting VirtualBox VM..."
-      mkdir -p $out
-      VBoxManage export "$vmName" --output "$out/$fileName"
-    '';
-
-  fileSystems."/".device = "/dev/disk/by-label/nixos";
-
-  boot.loader.grub.version = 2;
-  boot.loader.grub.device = "/dev/sda";
-
-  services.virtualbox.enable = true;
+  config = {
+    system.build.virtualBoxImage =
+      pkgs.vmTools.runInLinuxVM (
+        pkgs.runCommand "virtualbox-image"
+          { memSize = 768;
+            preVM =
+              ''
+                mkdir $out
+                diskImage=$out/image
+                ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "${cfg.baseImageSize}"
+                mv closure xchg/
+              '';
+            postVM =
+              ''
+                echo "creating VirtualBox disk image..."
+                ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi
+                rm $diskImage
+              '';
+            buildInputs = [ pkgs.utillinux pkgs.perl ];
+            exportReferencesGraph =
+              [ "closure" config.system.build.toplevel ];
+          }
+          ''
+            # Create a single / partition.
+            ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+            ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
+            . /sys/class/block/vda1/uevent
+            mknod /dev/vda1 b $MAJOR $MINOR
+  
+            # Create an empty filesystem and mount it.
+            ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
+            ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+            mkdir /mnt
+            mount /dev/vda1 /mnt
+  
+            # The initrd expects these directories to exist.
+            mkdir /mnt/dev /mnt/proc /mnt/sys
+            mount --bind /proc /mnt/proc
+            mount --bind /dev /mnt/dev
+            mount --bind /sys /mnt/sys
+  
+            # Copy all paths in the closure to the filesystem.
+            storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+  
+            echo "filling Nix store..."
+            mkdir -p /mnt/nix/store
+            set -f
+            cp -prd $storePaths /mnt/nix/store/
+  
+            mkdir -p /mnt/etc/nix
+            echo 'build-users-group = ' > /mnt/etc/nix/nix.conf
+  
+            # Register the paths in the Nix database.
+            printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+                chroot /mnt ${config.nix.package}/bin/nix-store --load-db
+  
+            # Create the system profile to allow nixos-rebuild to work.
+            chroot /mnt ${config.nix.package}/bin/nix-env \
+                -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+  
+            # `nixos-rebuild' requires an /etc/NIXOS.
+            mkdir -p /mnt/etc/nixos
+            touch /mnt/etc/NIXOS
+  
+            # `switch-to-configuration' requires a /bin/sh
+            mkdir -p /mnt/bin
+            ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+  
+            # Generate the GRUB menu.
+            ln -s vda /dev/sda
+            chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+  
+            umount /mnt/proc /mnt/dev /mnt/sys
+            umount /mnt
+          ''
+      );
+  
+    system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova"
+      { buildInputs = [ pkgs.linuxPackages.virtualbox ];
+        vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})";
+        fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
+      }
+      ''
+        echo "creating VirtualBox VM..."
+        export HOME=$PWD
+        VBoxManage createvm --name "$vmName" --register \
+          --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
+        VBoxManage modifyvm "$vmName" \
+          --memory 1536 --acpi on --vram 10 \
+          --nictype1 virtio --nic1 nat \
+          --audiocontroller ac97 --audio alsa \
+          --rtcuseutc on \
+          --usb on --mouse usbtablet
+        VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
+        VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
+          --medium ${config.system.build.virtualBoxImage}/disk.vdi
+  
+        echo "exporting VirtualBox VM..."
+        mkdir -p $out
+        VBoxManage export "$vmName" --output "$out/$fileName"
+      '';
+  
+    fileSystems."/".device = "/dev/disk/by-label/nixos";
+  
+    boot.loader.grub.version = 2;
+    boot.loader.grub.device = "/dev/sda";
+  
+    services.virtualbox.enable = true;
+  };
 }

From 1501536dcd35b96ebf7aa71bb9f4bd919da068ee Mon Sep 17 00:00:00 2001
From: Luke Clifton <ltclifton@gmail.com>
Date: Mon, 4 Aug 2014 18:21:25 +0800
Subject: [PATCH 032/107] Adding Haskell Package AD for automatic
 differentiation

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

diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix
new file mode 100644
index 000000000000..39c17de2c313
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ad/default.nix
@@ -0,0 +1,19 @@
+{ cabal, comonad, dataReify, doctest, erf, filepath, free, mtl
+, nats, reflection, tagged, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "ad";
+  version = "4.2.0.1";
+  sha256 = "06vjllcrnr4dv5h3xkcy5zhnhyamp6b6jahpnh2y0i6mp2bdw0pz";
+  buildDepends = [
+    comonad dataReify erf free mtl nats reflection tagged transformers
+  ];
+  testDepends = [ doctest filepath mtl ];
+  meta = {
+    homepage = "http://github.com/ekmett/ad";
+    description = "Automatic Differentiation";
+    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 11102c27a590..05c3dc7d4f4c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -135,6 +135,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   abstractPar = callPackage ../development/libraries/haskell/abstract-par {};
 
+  ad = callPackage ../development/libraries/haskell/ad {};
+
   adjunctions = callPackage ../development/libraries/haskell/adjunctions {};
 
   AES = callPackage ../development/libraries/haskell/AES {};

From ea448e90c392e8b7d2d4e4c713b000ac4310b5bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 13:03:25 +0200
Subject: [PATCH 033/107] povray: update to version 3.7

Committed on behalf of Thomas Strobel <ts468@cam.ac.uk>.
---
 pkgs/tools/graphics/povray/default.nix | 38 +++++++++++++++++++-------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index 6272bdae7803..b4a1d1a7d67a 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -1,21 +1,39 @@
-{stdenv, fetchurl}:
+{stdenv, fetchgit, autoconf, automake, boost149, zlib, libpng, libjpeg, libtiff}:
 
+let boost = boost149; in
 stdenv.mkDerivation {
-  name = "povray-3.6";
+  name = "povray-3.7";
 
-  src = fetchurl {
-    url = http://www.povray.org/ftp/pub/povray/Old-Versions/Official-3.62/Unix/povray-3.6.tar.bz2;
-    sha256 = "4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73";
+  src = fetchgit {
+    url = "https://github.com/POV-Ray/povray.git";
+    rev = "39ce8a24e50651904010dda15872d63be15d7c37";
+    sha256 = "0d56631d9daacb8967ed359025f56acf0bd505d1d9e752859e8ff8656ae72d20";
   };
 
+
+  buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff ];
+
   # the installPhase wants to put files into $HOME. I let it put the files
   # to $TMPDIR, so they don't get into the $out
-  patchPhase = ''
-    sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in};
+  postPatch = '' cd unix
+                 ./prebuild.sh
+                 cd ..
+                 sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in}
+                 sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in}
+                 sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in}
+                 sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in}
+               '';
+
+  configureFlags = "COMPILED_BY='nix' --with-boost-libdir=${boost}/lib --with-boost-includedir=${boost}/include";
+
+  preInstall = ''
+    mkdir "$TMP/bin"
+    for i in chown chgrp; do
+      echo '#!/bin/sh' >> "$TMP/bin/$i"
+      chmod +x "$TMP/bin/$i"
+      PATH="$TMP/bin:$PATH"
+    done
   '';
-  # I didn't use configureFlags because I couldn't pass the quotes properly
-  # for the COMPILED_BY.
-  configurePhase = "./configure --prefix=$out COMPILED_BY=\"nix\"";
   
   meta = {
     homepage = http://www.povray.org/;

From 36d339b74eef6a094fd6f3426eccdc1618598eb1 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Mon, 4 Aug 2014 13:11:29 +0200
Subject: [PATCH 034/107] added paperkey package

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

diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix
new file mode 100644
index 000000000000..c3b1d64c3a3e
--- /dev/null
+++ b/pkgs/tools/security/paperkey/default.nix
@@ -0,0 +1,28 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+
+  version = "1.3";
+  name = "paperkey-${version}";
+  
+  src = fetchurl {
+    url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz";
+    sha256 = "5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb";
+  };
+
+  enableParallelBuilding = true;
+  
+  meta = with stdenv.lib; {
+    description = "Store OpenPGP or GnuPG on paper";
+    longDescription = ''
+      A reasonable way to achieve a long term backup of OpenPGP (GnuPG, PGP, etc)
+      keys is to print them out on paper. Paper and ink have amazingly long
+      retention qualities - far longer than the magnetic or optical means that
+      are generally used to back up computer data.
+    '';
+    homepage = "http://www.jabberwocky.com/software/paperkey/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.skeidel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cbee0a724ff..a3d283967869 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5878,6 +5878,8 @@ let
 
   p11_kit = callPackage ../development/libraries/p11-kit { };
 
+  paperkey = callPackage ../tools/security/paperkey { };
+
   pangoxsl = callPackage ../development/libraries/pangoxsl { };
 
   pcl = callPackage ../development/libraries/pcl {

From 769ab3a218f1ea7999387605bcdb74c8f4b47d46 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 4 Aug 2014 02:46:35 +0200
Subject: [PATCH 035/107] nixos synaptics: allow null value for accelFactor,
 minSpeed and maxSpeed

Some desktop managers like GNOME are able to tweak the speed
of the mouse or synaptics at runtime with good defaults.
---
 nixos/modules/services/x11/hardware/synaptics.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index f2227a34a20c..f5b394b6d98b 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -41,16 +41,19 @@ in {
       };
 
       accelFactor = mkOption {
+        type = types.nullOr types.string;
         default = "0.001";
         description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
       };
 
       minSpeed = mkOption {
+        type = types.nullOr types.string;
         default = "0.6";
         description = "Cursor speed factor for precision finger motion.";
       };
 
       maxSpeed = mkOption {
+        type = types.nullOr types.string;
         default = "1.0";
         description = "Cursor speed factor for highest-speed finger motion.";
       };
@@ -120,9 +123,9 @@ in {
           MatchIsTouchpad "on"
           ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
           Driver "synaptics"
-          Option "MinSpeed" "${cfg.minSpeed}"
-          Option "MaxSpeed" "${cfg.maxSpeed}"
-          Option "AccelFactor" "${cfg.accelFactor}"
+          ${optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''}
+          ${optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''}
+          ${optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''}
           ${optionalString cfg.tapButtons tapConfig}
           Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
           Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"

From a9a4cdd3d02e1f5fd82b6e68bd1248aeb7f66dad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Aug 2014 13:59:08 +0200
Subject: [PATCH 036/107] nixUnstable: Update to 1.8pre3718_51485dc

---
 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 8e60413413f9..afcceb30474b 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.8pre3711_45f9a91";
+  name = "nix-1.8pre3718_51485dc";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/12967850/download/5/${name}.tar.xz";
-    sha256 = "826d2cc0f6a140b7b93bb31f4ef67cb04bda6423239c58d0e9c33d70434023eb";
+    url = "http://hydra.nixos.org/build/13025632/download/5/${name}.tar.xz";
+    sha256 = "69f3a0729b6df1adcbfc7c13df405ce7f3f7904b0cbcdd7f6ad3a0af45f4024c";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From be560b710e47b602a70e74125a8db2b3f37b4997 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 4 Aug 2014 15:53:05 +0200
Subject: [PATCH 037/107] anki: update from 2.0.26 to 2.0.28

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

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 86f4b961315e..1925c73b2e4a 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -6,13 +6,13 @@
 
 let
     py = pythonPackages;
-    version = "2.0.26";
+    version = "2.0.28";
 in
 stdenv.mkDerivation rec {
     name = "anki-${version}";
     src = fetchurl {
       url = "http://ankisrs.net/download/mirror/${name}.tgz";
-      sha256 = "0w1dn2v6mbyq4dfyjskx51qwfqy6jpskpg4v5pzrv30big274p4q";
+      sha256 = "0dj33mlc23y982kcl4h0aganb4fy70rl28mpj2mbcfphykzkv05s";
     };
 
     pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]

From 7af9134293d3aae716eaed596ac7e17af9e44cf5 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 4 Aug 2014 15:54:05 +0200
Subject: [PATCH 038/107] pass: update from 1.6.2 to 1.6.3

---
 pkgs/tools/security/pass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index f9bc01715924..3b44edcf1d3b 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -7,12 +7,12 @@
 assert withX -> xclip != null;
 
 stdenv.mkDerivation rec {
-  version = "1.6.2";
+  version = "1.6.3";
   name    = "password-store-${version}";
 
   src = fetchurl {
     url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-    sha256 = "1d32y6k625pv704icmhg46zg02kw5zcyxscgljxgy8bb5wv4lv2j";
+    sha256 = "1xs00c7ffqd0093i452kryw9sjip6dkp1pclx69zihb5l45d86fl";
   };
 
   patches = [ ./darwin-getopt.patch ];

From 166fbcaf28995fb50c59b86de8a53a2d56072334 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 4 Aug 2014 15:56:11 +0200
Subject: [PATCH 039/107] pngcrush: update from 1.7.73 to 1.7.76

---
 pkgs/tools/graphics/pngcrush/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index 2a4364164dd8..b27e5132804b 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.73";
+  name = "pngcrush-1.7.76";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "073y19af0sw36nw7draqw9zfd6n7q7b84kscy26s76fhj5x2gb0l";
+    sha256 = "0jbv3ijc0nfhy6pkhv4dwbk2v488rwixd8rv1c7lfs59wblb44hv";
   };
 
   configurePhase = ''

From b35770818d70924b2b71ae41ead270fe0be8c826 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Aug 2014 16:45:05 +0200
Subject: [PATCH 040/107] In Nix chroots, provide plain bash, not
 bash-interactive

This way we don't get ncurses in the chroot. Also, use a bind-mount of
/bin/sh to bash, rather than the entire /bin from the host filesystem.
---
 nixos/modules/services/misc/nix-daemon.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 1ebd3c3643df..c98c0511b566 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -22,14 +22,11 @@ let
 
   nixConf =
     let
-      # Tricky: if we're using a chroot for builds, then we need
-      # /bin/sh in the chroot (our own compromise to purity).
-      # However, since /bin/sh is a symlink to some path in the
-      # Nix store, which furthermore has runtime dependencies on
-      # other paths in the store, we need the closure of /bin/sh
-      # in `build-chroot-dirs' - otherwise any builder that uses
-      # /bin/sh won't work.
-      binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
+      # If we're using a chroot for builds, then provide /bin/sh in
+      # the chroot as a bind-mount to bash. This means we also need to
+      # include the entire closure of bash.
+      sh = pkgs.stdenv.shell;
+      binshDeps = pkgs.writeReferencesToFile sh;
     in
       pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } ''
         extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
@@ -40,7 +37,7 @@ let
         build-users-group = nixbld
         build-max-jobs = ${toString (cfg.maxJobs)}
         build-use-chroot = ${if cfg.useChroot then "true" else "false"}
-        build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths)
+        build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths)
         binary-caches = ${toString cfg.binaryCaches}
         trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
         $extraOptions
@@ -253,8 +250,6 @@ in
 
   config = {
 
-    nix.chrootDirs = [ "/bin" ];
-
     environment.etc."nix/nix.conf".source = nixConf;
 
     # List of machines for distributed Nix builds in the format

From eaeff97543685513d170f91eed593cd8b3f68dc7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 10:58:11 +0200
Subject: [PATCH 041/107] haskell-bencoding: re-generate with cabal2nix

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

diff --git a/pkgs/development/libraries/haskell/bencoding/default.nix b/pkgs/development/libraries/haskell/bencoding/default.nix
index c93def746554..325343985ac8 100644
--- a/pkgs/development/libraries/haskell/bencoding/default.nix
+++ b/pkgs/development/libraries/haskell/bencoding/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, attoparsec, deepseq, hspec, mtl, QuickCheck, text }:
 
 cabal.mkDerivation (self: {

From ec87968ba218ba87234480ed4bf93eab8c06ad7d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:10 +0200
Subject: [PATCH 042/107] haskell-auto-update: add version 0.1.0.0

---
 .../libraries/haskell/auto-update/default.nix    | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/auto-update/default.nix

diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix
new file mode 100644
index 000000000000..96096e73be2f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/auto-update/default.nix
@@ -0,0 +1,16 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, hspec }:
+
+cabal.mkDerivation (self: {
+  pname = "auto-update";
+  version = "0.1.0.0";
+  sha256 = "000aaccwpi373fnnmnq08d3128ncgv3w6pj25px25c2kp56z4c0l";
+  testDepends = [ hspec ];
+  meta = {
+    homepage = "https://github.com/yesodweb/wai";
+    description = "Efficiently run periodic, on-demand actions";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 91ba32a239e8..b86b22ff1859 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -209,6 +209,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec-enumerator {};
 
+  autoUpdate = callPackage ../development/libraries/haskell/auto-update {};
+
   aws = callPackage ../development/libraries/haskell/aws {};
 
   authenticate = callPackage ../development/libraries/haskell/authenticate {};

From 67e4ec70c31d27489c7c3ea6eb39306c60428ea8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:25 +0200
Subject: [PATCH 043/107] haskell-amqp: update to version 0.10

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

diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix
index 2fefde3a8caa..3b9883dc04a3 100644
--- a/pkgs/development/libraries/haskell/amqp/default.nix
+++ b/pkgs/development/libraries/haskell/amqp/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "amqp";
-  version = "0.9";
-  sha256 = "10yacflzvf7y21yi6frs88gdbhf5g4j99ag8mwv6jrwfzwqszs5j";
+  version = "0.10";
+  sha256 = "0606grl2149phzqf0aww8264f9xaw4486ps5jw47ar57mcnxsml6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 4c9761e14981046a9bba109aa2643f857d20f5c6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:27 +0200
Subject: [PATCH 044/107] haskell-authenticate: update to version 1.3.2.9

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

diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index 381f9d81d013..1441879606e4 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "authenticate";
-  version = "1.3.2.8";
-  sha256 = "1ylijkj32li9nm4x16d66h6a74q07m4v3n2dqm67by548wfyh1j9";
+  version = "1.3.2.9";
+  sha256 = "09vg7m2sh3566q7jgi85djc5jrq2y06swlbj1fbym6yf4cmk8gdr";
   buildDepends = [
     aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit
     httpTypes monadControl network resourcet tagstreamConduit text

From 0749feb5e73bb32799507a2bdc527061bbe1219f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:29 +0200
Subject: [PATCH 045/107] haskell-aws: update to version 0.9.2

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

diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix
index b50a61f9157f..ff33d1378cbd 100644
--- a/pkgs/development/libraries/haskell/aws/default.nix
+++ b/pkgs/development/libraries/haskell/aws/default.nix
@@ -3,20 +3,20 @@
 { cabal, aeson, base16Bytestring, base64Bytestring, blazeBuilder
 , byteable, caseInsensitive, cereal, conduit, conduitExtra
 , cryptohash, dataDefault, filepath, httpConduit, httpTypes
-, liftedBase, monadControl, mtl, resourcet, text, time
+, liftedBase, monadControl, mtl, network, resourcet, text, time
 , transformers, unorderedContainers, utf8String, vector, xmlConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "aws";
-  version = "0.9.1";
-  sha256 = "1fp18j8my9v7d6z0d28bc1hjzrs9znf3c986950pfpv2bsiw7m6d";
+  version = "0.9.2";
+  sha256 = "1jmvf1x3vamcjb89mk52l1iikdchab8pm23iw9y1d4zm4636czxm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson base16Bytestring base64Bytestring blazeBuilder byteable
     caseInsensitive cereal conduit conduitExtra cryptohash dataDefault
-    filepath httpConduit httpTypes liftedBase monadControl mtl
+    filepath httpConduit httpTypes liftedBase monadControl mtl network
     resourcet text time transformers unorderedContainers utf8String
     vector xmlConduit
   ];

From 7b81b23875ebd01bc1035724b963cde47a5b1d6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:31 +0200
Subject: [PATCH 046/107] haskell-cairo: update to version 0.13.0.0

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

diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index b46b8508e9ac..cbb362402a61 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String
-, zlib
+{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, text
+, utf8String, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "cairo";
-  version = "0.12.5.3";
-  sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7";
-  buildDepends = [ mtl utf8String ];
+  version = "0.13.0.0";
+  sha256 = "1sw1f50kmqln1mkvrr6g85b46dn0ipwnvyl13kxzhq5g581rra92";
+  buildDepends = [ mtl text utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ cairo libc pkgconfig zlib ];
   pkgconfigDepends = [ cairo ];

From 35017d3a64a3376b915087c6f7989d457e35324c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:34 +0200
Subject: [PATCH 047/107] haskell-cookie: update to version 0.4.1.2

---
 .../libraries/haskell/cookie/default.nix            | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
index 6a35f3d55238..1427b17756c1 100644
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ b/pkgs/development/libraries/haskell/cookie/default.nix
@@ -1,12 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeBuilder, dataDefault, deepseq, text, time }:
+{ cabal, blazeBuilder, dataDefault, deepseq, HUnit, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
+, time
+}:
 
 cabal.mkDerivation (self: {
   pname = "cookie";
-  version = "0.4.1.1";
-  sha256 = "1w1nh7h4kc9pr9kpi8fkrqiih37mp3gcnxf42r01nciq4sh4yi3m";
+  version = "0.4.1.2";
+  sha256 = "1dxga56m4mza3annhb48ryb31kf0kxr3w99c4mwh9w9l77xhcq3i";
   buildDepends = [ blazeBuilder dataDefault deepseq text time ];
+  testDepends = [
+    blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text time
+  ];
   meta = {
     homepage = "http://github.com/snoyberg/cookie";
     description = "HTTP cookie parsing and rendering";

From 3d592d9e88f1da0ba18ff89c857bf797c6bfe35f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:36 +0200
Subject: [PATCH 048/107] haskell-fast-logger: update to version 2.2.0

---
 .../development/libraries/haskell/fast-logger/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix
index 6a1aa3dfb3c5..d44041038089 100644
--- a/pkgs/development/libraries/haskell/fast-logger/default.nix
+++ b/pkgs/development/libraries/haskell/fast-logger/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeBuilder, filepath, hspec, text }:
+{ cabal, autoUpdate, blazeBuilder, filepath, hspec, text }:
 
 cabal.mkDerivation (self: {
   pname = "fast-logger";
-  version = "2.1.5";
-  sha256 = "12f7yad2f6q846rw2ji5fsx3d7qd8jdrnnzsbji5bpv00mvvsiza";
-  buildDepends = [ blazeBuilder filepath text ];
+  version = "2.2.0";
+  sha256 = "02gc5f7vgwfdlhfawki4xxrl33lbdl05wh64qm3mb3h2dv1gnwrr";
+  buildDepends = [ autoUpdate blazeBuilder filepath text ];
   testDepends = [ hspec ];
   meta = {
     description = "A fast logging system";

From e8d0762e44b9df88881d3e8b5a0895ad37866e78 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:38 +0200
Subject: [PATCH 049/107] haskell-fb: update to version 1.0.4

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

diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
index 51a6ea84c50c..37d243097324 100644
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ b/pkgs/development/libraries/haskell/fb/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fb";
-  version = "1.0.2";
-  sha256 = "1xgldk690dpbmhzmjlngpbalmbs0xrc7265zc7frphpsbbw3cnqc";
+  version = "1.0.4";
+  sha256 = "1sp0x5p9l02i2ynvynazhgs5lqqwih997c2fyfp0xi24qsc7ilr2";
   buildDepends = [
     aeson attoparsec base16Bytestring base64Bytestring cereal conduit
     conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault

From c3683828fac150f2654993537651c7c1a3e42c08 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:40 +0200
Subject: [PATCH 050/107] haskell-ghc-mod: update to version 4.1.6

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

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 3fd12bcfc559..28f1f25eb258 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "4.1.5";
-  sha256 = "192v0h9nhi7xgvidyisn3rpr6kjpkibrm2b859b6a92gp0h37nnn";
+  version = "4.1.6";
+  sha256 = "093wafaizr2xf7vmzj6f3vs8ch0vpcmwlrja6af6hshgaj2d80qs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From baef1bd1d441a228df16841741eade61b9a60534 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:42 +0200
Subject: [PATCH 051/107] haskell-ghcjs-dom: update to version 0.1.0.0

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

diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
index b0d2d9f30c4d..8c87bcc0dc5f 100644
--- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
+++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, ghcjsBase, mtl }:
+{ cabal, ghcjsBase, mtl, text }:
 
 cabal.mkDerivation (self: {
   pname = "ghcjs-dom";
-  version = "0.0.10";
-  sha256 = "0xffr197m6qam4q7ckgcwl0v9kwrxa5fm894c9vyxdmlcjyn38rm";
-  buildDepends = [ ghcjsBase mtl ];
+  version = "0.1.0.0";
+  sha256 = "0qm43bd4m7w14p6ag643h09pll4fp09j1mzjyqvp0dhal03dc723";
+  buildDepends = [ ghcjsBase mtl text ];
   meta = {
     description = "DOM library that supports both GHCJS and WebKitGTK";
     license = self.stdenv.lib.licenses.mit;

From 59500d2f2b20472b82ff1087a1b5e9781a99f32e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:44 +0200
Subject: [PATCH 052/107] haskell-gio: update to version 0.13.0.0

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

diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix
index f189ca43f96f..69cc5cd9ea6f 100644
--- a/pkgs/development/libraries/haskell/gio/default.nix
+++ b/pkgs/development/libraries/haskell/gio/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gio";
-  version = "0.12.5.3";
-  sha256 = "1n9sima0m30w1bmfk0wb4fawrg76vgpvlzki0kwdh6f0sfczxywc";
+  version = "0.13.0.0";
+  sha256 = "05mycm6nrwwpjflcmm3w33b5nmm6fgyzwzrx1piqazvd1magwcyj";
   buildDepends = [ glib mtl ];
   buildTools = [ gtk2hsBuildtools ];
   pkgconfigDepends = [ glib ];

From 44b84153e49acaf751dff786fb01ca4b6983b970 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:46 +0200
Subject: [PATCH 053/107] haskell-github: update to version 0.9

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

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 68c46f5866d6..31e4ea86ddf9 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.8";
-  sha256 = "0lzz7q2gjiq4z8yi1sb981m220qnwjizk9hqv09yfj5a4grqfchf";
+  version = "0.9";
+  sha256 = "19ff9srvm03n9iz7mf6wadydfw0xs0j9ayvr86dmmp9blmjkqc0d";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure
     hashable HTTP httpConduit httpTypes network text time

From 6ebac2ce68438d794fe92a02acb850a5c915e292 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:48 +0200
Subject: [PATCH 054/107] haskell-glib: update to version 0.13.0.0

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

diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 055f61cbc76c..971ef970a68c 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -1,12 +1,13 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, utf8String }:
+{ cabal, glib, gtk2hsBuildtools, libc, pkgconfig, text, utf8String
+}:
 
 cabal.mkDerivation (self: {
   pname = "glib";
-  version = "0.12.5.4";
-  sha256 = "1jbqfcsmsghq67lwnk6yifs34lxvh6xfbzxzfryalifb4zglccz6";
-  buildDepends = [ utf8String ];
+  version = "0.13.0.0";
+  sha256 = "0l3mkbwm90zfgn6qrblnp642pr4m9lqpi4pg3kfpqlqp5vziszy9";
+  buildDepends = [ text utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ glib ];

From efc9d9cb4762546a45bdd1479324d78373597ed3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:50 +0200
Subject: [PATCH 055/107] haskell-graph-wrapper: update to version 0.2.4.3

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

diff --git a/pkgs/development/libraries/haskell/graph-wrapper/default.nix b/pkgs/development/libraries/haskell/graph-wrapper/default.nix
index 711f490aa19a..f38bc24d2464 100644
--- a/pkgs/development/libraries/haskell/graph-wrapper/default.nix
+++ b/pkgs/development/libraries/haskell/graph-wrapper/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "graph-wrapper";
-  version = "0.2.4.2";
-  sha256 = "0cf70xvmzn4w5pg1bxizajqgcbjwwk6jrd7hnb3kfqy1v3apifyf";
+  version = "0.2.4.3";
+  sha256 = "1wfazkczc9m1r0snzv5b4ax315g93qgrnqc2wnrqqnzhcfy1symg";
   meta = {
     homepage = "http://www.github.com/batterseapower/graph-wrapper";
     description = "A wrapper around the standard Data.Graph with a less awkward interface";

From c36fa80fd84e7af68a88124512a8ec99d782e359 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:52 +0200
Subject: [PATCH 056/107] haskell-gtk: update to version 0.13.0.0

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

diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index 9fd8cf6f303d..652580b08fb7 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango
-, pkgconfig
+, pkgconfig, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "gtk";
-  version = "0.12.5.7";
-  sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w";
-  buildDepends = [ cairo gio glib mtl pango ];
+  version = "0.13.0.0";
+  sha256 = "04xi1415i3qaiif9ha5wnmyzxxw8ix17zpvvfjn61nrxlk6p973m";
+  buildDepends = [ cairo gio glib mtl pango text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ glib gtk ];

From 3b7780d88ffec481124ef158e862899557777c28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:54 +0200
Subject: [PATCH 057/107] haskell-gtk2hs-buildtools: update to version 0.13.0.1

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

diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index e0a0053b2ea5..39ef8cbba0f4 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk2hs-buildtools";
-  version = "0.13.0.0";
-  sha256 = "075f6jjkk56h0nda0gbdr775d72c0b3d2z483cff2bnnjf8aqwa6";
+  version = "0.13.0.1";
+  sha256 = "0ngdg44hxpyga9kwm70340c8jhsh9wl5rja3wx9mfx194idivaxa";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath hashtables random ];

From b89869ee10834f4e705356c6818552d012d862f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:56 +0200
Subject: [PATCH 058/107] haskell-gtksourceview2: update to version 0.13.0.0

---
 .../libraries/haskell/gtksourceview2/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
index caa825535ecc..c4b2104eee49 100644
--- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix
+++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix
@@ -1,14 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl
-, pkgconfig
+, pkgconfig, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "gtksourceview2";
-  version = "0.12.5.0";
-  sha256 = "125psfr58na60nz5ax3va08fq1aa4knzjccj8ghwk8x9fkzddfs9";
-  buildDepends = [ glib gtk mtl ];
+  version = "0.13.0.0";
+  sha256 = "0md4dwg68cgq5qj80rjvsrckwn2ap9d1xp0hy8w1iiyii8dfqcnn";
+  buildDepends = [ glib gtk mtl text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ gtksourceview ];

From 6e1fbffcbcf6b21430396446a623a5f9fe6758ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:10:59 +0200
Subject: [PATCH 059/107] haskell-hsimport: update to version 0.5

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

diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix
index b125dbcef642..7f46f1e54fd6 100644
--- a/pkgs/development/libraries/haskell/hsimport/default.nix
+++ b/pkgs/development/libraries/haskell/hsimport/default.nix
@@ -1,19 +1,19 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, attoparsec, cmdargs, filepath, haskellSrcExts, lens, mtl
-, split, tasty, tastyGolden, text
+{ cabal, attoparsec, cmdargs, dyre, filepath, haskellSrcExts, lens
+, mtl, split, tasty, tastyGolden, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "hsimport";
-  version = "0.4";
-  sha256 = "1pkj6cfdfyrcrm6gr4a43y6s4qhwpli6zgnlx4ycmhs3yh5kay60";
+  version = "0.5";
+  sha256 = "18rhldw6vbkjcpx373m784sppadccm2b3xx3zzr0l45dwmsh6rb4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsec cmdargs haskellSrcExts lens mtl split text
+    attoparsec cmdargs dyre haskellSrcExts lens mtl split text
   ];
-  testDepends = [ filepath tasty tastyGolden ];
+  testDepends = [ filepath haskellSrcExts tasty tastyGolden ];
   doCheck = false;
   meta = {
     description = "A command line program for extending the import list of a Haskell source file";

From 8b0af6f98f938508863708e77c832bad937dd29a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:01 +0200
Subject: [PATCH 060/107] haskell-http-client: update to version 0.3.6.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 acd93b29e18c..08d93287ecbf 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.6";
-  sha256 = "0zav8arj6swhrzfyxf6py2yfpphjd0bllz7rm1540vb5lrhg4znm";
+  version = "0.3.6.1";
+  sha256 = "0mamndx2fyvshchcwv8ic910b90hp8rgbjhgqww0zpg8p1rr0v9h";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

From d60f18aa3fd72ac419b1a6087a337b6fd05ba547 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:03 +0200
Subject: [PATCH 061/107] haskell-iproute: update to version 1.3.1

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

diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix
index 2aa33e9b4417..cfb05b9f0948 100644
--- a/pkgs/development/libraries/haskell/iproute/default.nix
+++ b/pkgs/development/libraries/haskell/iproute/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iproute";
-  version = "1.3.0";
-  sha256 = "1n9lcm1f2rlqkvg90zikf2h4badzh9r24zqb27648l48254m6q5p";
+  version = "1.3.1";
+  sha256 = "1l3asv8q1jiwsvpq6kkigrzpm3pjbm03gpc4rbhn6kpi6z9h8cdp";
   buildDepends = [ appar byteorder network ];
   testDepends = [
     appar byteorder doctest hspec network QuickCheck safe

From 57c877bdf8676d2a3b7f3746504cfea8c08bc9dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:05 +0200
Subject: [PATCH 062/107] haskell-monad-extras: update to version 0.5.9

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

diff --git a/pkgs/development/libraries/haskell/monad-extras/default.nix b/pkgs/development/libraries/haskell/monad-extras/default.nix
index 3be5d8298565..0b655689dc44 100644
--- a/pkgs/development/libraries/haskell/monad-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monad-extras/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-extras";
-  version = "0.5.8";
-  sha256 = "1h7gjdmbdjw2k49xlflca88bxiid7gxl8l9gzmywybllff376npl";
+  version = "0.5.9";
+  sha256 = "1y24yz635brllfygia1mbln4d8xiwb0pq0izh5pil7511gijhs0s";
   buildDepends = [
     mmorph monadControl stm transformers transformersBase
   ];

From 8795d98ceca844e78d10fe4734b70c6a4400b693 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:07 +0200
Subject: [PATCH 063/107] haskell-monad-logger: update to version 0.3.7.1

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

diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index 8a4122efc8fa..cb3a13f8c6ed 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.7";
-  sha256 = "03fzp8cvx8qapyjgnm6gywj8b1pcd43y3fb4vg1wgxa55lsg6y58";
+  version = "0.3.7.1";
+  sha256 = "0imr1bgcpfm19a91r4i6lii7gycx77ysfrdri030zr2jjrvggh9i";
   buildDepends = [
     blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
     monadControl monadLoops mtl resourcet stm stmChans text

From aaff40e5217d046539df2d69de4dbad00487f3f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:09 +0200
Subject: [PATCH 064/107] haskell-pango: update to version 0.13.0.0

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

diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index 765f4c7a3fce..5ce05edb3073 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -1,13 +1,14 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
 { cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig
+, text
 }:
 
 cabal.mkDerivation (self: {
   pname = "pango";
-  version = "0.12.5.3";
-  sha256 = "1n64ppz0jqrbzvimbz4avwnx3z0n5z2gbmbmca0hw9wqf9j6y79a";
-  buildDepends = [ cairo glib mtl ];
+  version = "0.13.0.0";
+  sha256 = "0qrsivr6z8pp4ibg1vyzyg2fw0jzrshn6h6g6vff93awxzqq9rlw";
+  buildDepends = [ cairo glib mtl text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ cairo pango ];

From 50fce3ede058258eb8d54f8063d9ed6e72e641d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:11 +0200
Subject: [PATCH 065/107] haskell-pathtype: update to version 0.5.4

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

diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix
index eb6fb43e8d6f..dc3fa3e85b56 100644
--- a/pkgs/development/libraries/haskell/pathtype/default.nix
+++ b/pkgs/development/libraries/haskell/pathtype/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pathtype";
-  version = "0.5.3";
-  sha256 = "11plb7xw4j8vjziw1q0ymx33p6185cxd2hqrxw2hgsfzf2b9dvqg";
+  version = "0.5.4";
+  sha256 = "1ns5q3nrkl99xp4mrmk8wpvb9qzyvnw5cyjwh5rh76ykm2d5dbg7";
   buildDepends = [ QuickCheck time ];
   meta = {
     homepage = "http://code.haskell.org/pathtype";

From b61cf1f0c8f80022759d28ba8b20619f06c8d447 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:13 +0200
Subject: [PATCH 066/107] haskell-pipes-aeson: update to version 0.4.1.2

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

diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
index 96044afae0e9..91e31801e7f2 100644
--- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-aeson";
-  version = "0.4.1.1";
-  sha256 = "1z520c9l2wqjcv5lb997n3zfks7p0z7dlwgqm74dcwnnfy3mfp9j";
+  version = "0.4.1.2";
+  sha256 = "0wacib0wf40bkm6rp2qcsrahc43g89l3icclbrshk8r54dhbazl7";
   buildDepends = [
     aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
     transformers

From 2ef4937454d38afbbfb74d277d43f42c21a73a75 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:15 +0200
Subject: [PATCH 067/107] haskell-purescript: update to version 0.5.4

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

diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
index ab05167683fc..5d6c54f4b837 100644
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ b/pkgs/development/libraries/haskell/purescript/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "purescript";
-  version = "0.5.3";
-  sha256 = "05vhz3j4gx9paxmvimy154730078bl148819shwml6l6vq02723i";
+  version = "0.5.4";
+  sha256 = "02mxg9bsyzhr7xclf7jdsjjwcc6d05ibji64n9783rc1i9clc2gg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From c4b121a639f41f55d05f2b2b8c29c0293c53154d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:17 +0200
Subject: [PATCH 068/107] haskell-retry: update to version 0.5

---
 .../libraries/haskell/retry/default.nix            | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix
index f3fe5343e523..9a0a994cf77e 100644
--- a/pkgs/development/libraries/haskell/retry/default.nix
+++ b/pkgs/development/libraries/haskell/retry/default.nix
@@ -1,12 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, dataDefault, exceptions, transformers }:
+{ cabal, dataDefaultClass, exceptions, hspec, HUnit, QuickCheck
+, time, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "retry";
-  version = "0.4";
-  sha256 = "16njq924b5n7jyfc059dbypp529gqlc9qnzd7wjk4m7dpm5bww67";
-  buildDepends = [ dataDefault exceptions transformers ];
+  version = "0.5";
+  sha256 = "1qp949w8pisgki06j5qgaxw1761q3gfccc7bqnhqpchazl4p6p6n";
+  buildDepends = [ dataDefaultClass exceptions transformers ];
+  testDepends = [
+    dataDefaultClass exceptions hspec HUnit QuickCheck time
+    transformers
+  ];
   jailbreak = true;
   meta = {
     homepage = "http://github.com/Soostone/retry";

From 44c43556d940e9c4887de9d7447efeadd6be7d0e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:19 +0200
Subject: [PATCH 069/107] haskell-simple-conduit: update to version 0.5.1

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

diff --git a/pkgs/development/libraries/haskell/simple-conduit/default.nix b/pkgs/development/libraries/haskell/simple-conduit/default.nix
index a55267d426b1..f1ad007c8f97 100644
--- a/pkgs/development/libraries/haskell/simple-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/simple-conduit/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-conduit";
-  version = "0.5.0";
-  sha256 = "0fbm1nv9190p1b038p6zxmw042cgm5jgkfbhscw1fslgzja90iyz";
+  version = "0.5.1";
+  sha256 = "1jy70cdw2h6fd2618dczajml5k82kkjmd2n0mgbby2mr6r3sk5zr";
   buildDepends = [
     bifunctors chunkedData either exceptions filepath free liftedAsync
     liftedBase mmorph monadControl monoTraversable mtl mwcRandom

From 810ba75da9e7fa1a0f0e726c1d225c96d289a260 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:21 +0200
Subject: [PATCH 070/107] haskell-svgcairo: update to version 0.13.0.0

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

diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix
index 01c6e4d999f5..96b47a877414 100644
--- a/pkgs/development/libraries/haskell/svgcairo/default.nix
+++ b/pkgs/development/libraries/haskell/svgcairo/default.nix
@@ -1,12 +1,12 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }:
+{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl, text }:
 
 cabal.mkDerivation (self: {
   pname = "svgcairo";
-  version = "0.12.5.2";
-  sha256 = "0l3903fzd5pk9wmxjdmx6vyym2r90b33hs6p2sfdks2lx352i94l";
-  buildDepends = [ cairo glib mtl ];
+  version = "0.13.0.0";
+  sha256 = "1i93dhg2fpnk38lgbfpsl97xpfgifrl7xs5nny5vj4hi8ln76ih0";
+  buildDepends = [ cairo glib mtl text ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc ];
   pkgconfigDepends = [ librsvg ];

From f6f613aaaf2d2aff186eed008e4106682e92bbb7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:26 +0200
Subject: [PATCH 071/107] haskell-twitter-types: update to version 0.3.20140801

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

diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
index f87230271f13..b0358a3ac726 100644
--- a/pkgs/development/libraries/haskell/twitter-types/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-types/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "twitter-types";
-  version = "0.3.20140620";
-  sha256 = "02mwdgz1l1z5k5k78bjnnbabcr27xixli1gqk6rmqrarcylybvll";
+  version = "0.3.20140801";
+  sha256 = "1ryvbshafgnfvn6697lb5qj9y61bm9371lzaz5v4xjf0jklm2z5n";
   buildDepends = [ aeson httpTypes text unorderedContainers ];
   testDepends = [
     aeson attoparsec httpTypes HUnit shakespeare testFramework

From d716b24b64d1d5efc1a0278a2b418d7f71165ba5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:28 +0200
Subject: [PATCH 072/107] haskell-unbounded-delays: update to version 0.1.0.8

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

diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
index af3dd417a995..f03aedad4fd3 100644
--- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix
+++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbounded-delays";
-  version = "0.1.0.7";
-  sha256 = "1nv50i90hgvcl51w7s8x1c1ylpzyrbvs2mz5zfn68lr1ix2lk879";
+  version = "0.1.0.8";
+  sha256 = "1jdlpg82kndz6g97bw8fb6sjyyvylrcrg982xnhgi36717f0pv40";
   meta = {
     homepage = "https://github.com/basvandijk/unbounded-delays";
     description = "Unbounded thread delays and timeouts";

From e699f5e663c82e6e93dfac6cb9ccb6941b878409 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:30 +0200
Subject: [PATCH 073/107] haskell-unix-time: update to version 0.3.3

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

diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix
index 1fc8fd24e252..60f0f21b292a 100644
--- a/pkgs/development/libraries/haskell/unix-time/default.nix
+++ b/pkgs/development/libraries/haskell/unix-time/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unix-time";
-  version = "0.3.2";
-  sha256 = "0bbzrm4hprqsljwscpfmnw3ipj809q7570alzn1qampijsbb4cds";
+  version = "0.3.3";
+  sha256 = "018wpr5d2kjv8syj97664sqh1v7ws1780qmlfxvrakj86z9k5i8x";
   buildDepends = [ binary ];
   testDepends = [ doctest hspec QuickCheck time ];
   meta = {

From 86c1826fe06e74b3c8aeda43c4176d4973ccd90d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:32 +0200
Subject: [PATCH 074/107] haskell-wai-extra: update to version 3.0.1.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 4d63904a0926..93f95d36a0c5 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "3.0.1.1";
-  sha256 = "099pxahczai6ychsm04bwcvvd9m6lan5nqg159ny4jakpyk67zs8";
+  version = "3.0.1.2";
+  sha256 = "15v3mk7kbinvynsfxb95lwvg52wkpm3q9k5an8ak936ll3j2s14z";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder caseInsensitive
     dataDefaultClass deepseq fastLogger httpTypes liftedBase network

From 59b295ca1613cbd29dd7461cb47411e8cd56722d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:34 +0200
Subject: [PATCH 075/107] haskell-wai-logger: update to version 2.2.0

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

diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix
index a94742ea2e7c..d824355b1315 100644
--- a/pkgs/development/libraries/haskell/wai-logger/default.nix
+++ b/pkgs/development/libraries/haskell/wai-logger/default.nix
@@ -1,18 +1,18 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, blazeBuilder, byteorder, caseInsensitive, doctest
-, easyFile, fastLogger, httpTypes, network, unixTime, wai, waiTest
+{ cabal, autoUpdate, blazeBuilder, byteorder, caseInsensitive
+, doctest, fastLogger, httpTypes, network, unixTime, wai
 }:
 
 cabal.mkDerivation (self: {
   pname = "wai-logger";
-  version = "2.1.2";
-  sha256 = "0rfgcq433k5jpdgwyzrzgiy5h66bb38xfqzb63gmqabysr8wa9kl";
+  version = "2.2.0";
+  sha256 = "0dl4c9b1yl22df421p6yw405bv1skvh6dk5rgybxz1sspvb94gvy";
   buildDepends = [
-    blazeBuilder byteorder caseInsensitive easyFile fastLogger
+    autoUpdate blazeBuilder byteorder caseInsensitive fastLogger
     httpTypes network unixTime wai
   ];
-  testDepends = [ doctest waiTest ];
+  testDepends = [ doctest ];
   doCheck = false;
   meta = {
     description = "A logging system for WAI";

From ef38085495811907c5330815388b23f3b4cdf559 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:36 +0200
Subject: [PATCH 076/107] haskell-wai-websockets: update to version 3.0.0.1

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

diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix
index cb88d7ab6e69..a60a6e9dda01 100644
--- a/pkgs/development/libraries/haskell/wai-websockets/default.nix
+++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-websockets";
-  version = "3.0.0";
-  sha256 = "0bpzkh9a5j0a282z4dj9dqnjsgd0g8gyvvp0xm0a53582zfhfi5s";
+  version = "3.0.0.1";
+  sha256 = "01rbwyx2ks6hdaw5qw7dibidyw4bh85s2gzqy4rhmxpdcnmxxmnz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 0453805178ca0ef591b16d6613d36fc159d12333 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:38 +0200
Subject: [PATCH 077/107] haskell-wai: update to version 3.0.1.1

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

diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index 6c70fede1eca..03e58e59476b 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "3.0.1";
-  sha256 = "1889l6fbgvxn13yaskcvjrq07vs62ayvq8q5rn9cpq0yqyc6llcw";
+  version = "3.0.1.1";
+  sha256 = "04dka0mgqckzhvmz8m9gqvk5qq79g23q8wx40v42fwhkwwy7f8i0";
   buildDepends = [ blazeBuilder httpTypes network text vault ];
   testDepends = [ blazeBuilder hspec ];
   meta = {

From cd4b52b7d1587d80d0ebba1ec79e198864ff8218 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:40 +0200
Subject: [PATCH 078/107] haskell-warp: update to version 3.0.0.5

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 3065c52c0f9f..aa910aacb224 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "3.0.0.4";
-  sha256 = "119yw4k11v2gq3z4gjr51i8z551cbbgwhkfnl9jr4ira06m6si2v";
+  version = "3.0.0.5";
+  sha256 = "1in9gnxb15np4vj47q6c07hr9iq2apbx0a1brkaqcmfq3c9wq9d5";
   buildDepends = [
     blazeBuilder caseInsensitive hashable httpDate httpTypes network
     simpleSendfile streamingCommons text unixCompat void wai

From 71db2255b51c2eb00e610fc19f5185f29f4a1152 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:42 +0200
Subject: [PATCH 079/107] haskell-yesod-auth: update to version 1.3.4

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

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 3dcda2466880..3f0b9267f009 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.3";
-  sha256 = "05kzsrb49r11yhsrn9j7vx90831qd1jni1h8wdj26qn85anxr10z";
+  version = "1.3.4";
+  sha256 = "138wnrs9bf6wl9r4mc1fhshxky7bc6anhgqnwljx4gzvzsd0vq0y";
   buildDepends = [
     aeson attoparsecConduit authenticate base16Bytestring
     base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable

From 5e04965132e593bbc9f0d18f7dc2362ec7b1f713 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:44 +0200
Subject: [PATCH 080/107] haskell-yesod-bin: update to version 1.2.12.1

---
 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 864602a3a53f..a22df50bf472 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -12,8 +12,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.12";
-  sha256 = "0ksl78k27sshp9l6x7blv5csswv6vb8k632ggj9whnp8akzn37x1";
+  version = "1.2.12.1";
+  sha256 = "03vnxpapcg1z1xk0m077wn5rly9h2j7548zd8drlb455lv7np7mj";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 61c1403b05e784730488f7d89fa7b90945fa1c34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 11:11:46 +0200
Subject: [PATCH 081/107] haskell-yesod-test: update to version 1.2.3.2

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

diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index 41f8f694ca15..16dc0b6857f4 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.3.1";
-  sha256 = "0q4w7q22d8hvsg939w686fb295v8cznnhqlfd1bh0v2lp9dih4ms";
+  version = "1.2.3.2";
+  sha256 = "05h7m0v92b8js71kgkvqc9nzpwa8hhxp052pknbvcfv3yn3spsx9";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network

From 20059d37f533bd3382a6f8be9303f576c2080b14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 13:07:39 +0200
Subject: [PATCH 082/107] LambdaHack: jailbreak to fix build with latest 'gtk'

---
 pkgs/games/LambdaHack/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index 3ddbbbdc5bf8..6536d83183cd 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     unorderedContainers vector vectorBinaryInstances zlib
   ];
   doCheck = false;
+  patchPhase = ''
+    sed -i -e 's|gtk >=.*|gtk|' LambdaHack.cabal
+  '';
   meta = {
     homepage = "http://github.com/LambdaHack/LambdaHack";
     description = "A roguelike game engine in early development";

From e2b8a3ee7ffd1b68635a0d745c8b4777ee8cffce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Aug 2014 13:08:55 +0200
Subject: [PATCH 083/107] haskell-glade: jailbreak to fix build with recent
 versions of 'glib' and 'gtk'

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

diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix
index 68ed02f4b184..86a062b69098 100644
--- a/pkgs/development/libraries/haskell/glade/default.nix
+++ b/pkgs/development/libraries/haskell/glade/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];
   pkgconfigDepends = [ gtkC libglade ];
+  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/gtk2hs/";
     description = "Binding to the glade library";

From e27a88744030e9f61daca5521db22cd8db3134c2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 4 Aug 2014 19:56:53 +0400
Subject: [PATCH 084/107] Give up for now: roll back SBCL to 1.2.0, as: 1.2.2
 fails on i686; 1.2.1 fails everywhere

---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 6872fee846f3..7f7a76060bdb 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.2";
+  version = "1.2.0";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "08jk1bjk7087gq4ibzs1d27r0c6pigbvmff351j9a03kvl652b2v";
+    sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
   };
 
   buildInputs = [ ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3d283967869..a46693b92359 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3316,7 +3316,7 @@ let
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
   sbcl = callPackage ../development/compilers/sbcl {
-    clisp = clisp_2_44_1;
+    clisp = clisp;
   };
 
   scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };

From 285741865951ae08c057272ccf22dbe0c3ad0516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 4 Aug 2014 20:09:21 +0200
Subject: [PATCH 085/107] freerdp: mark the unstable version as broken (it
 fails to build)

---
 pkgs/applications/networking/remote/freerdp/unstable.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
index 6c133e9dbb49..a8388b4829af 100644
--- a/pkgs/applications/networking/remote/freerdp/unstable.nix
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -70,6 +70,8 @@ stdenv.mkDerivation rec {
     homepage = http://www.freerdp.com/;
 
     license = "free-non-copyleft";
+
+    broken = true;  # fails to build
   };
 }
 

From b947cde3a5678501919ff50bb661f3e87288ebe4 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Mon, 4 Aug 2014 15:09:07 -0500
Subject: [PATCH 086/107] bind: Expand to all unix platforms.

---
 pkgs/servers/dns/bind/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index db8db908d1ec..921d8e907f19 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.isc;
 
     maintainers = with stdenv.lib.maintainers; [viric simons];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; unix;
   };
 }

From 86133bb6bfa9f128a99487b7a128793191baf7a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Tue, 5 Aug 2014 00:36:14 +0200
Subject: [PATCH 087/107] melt: use ffmpeg instead of libav, fixes libx264
 export

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

diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 00d586a9f04c..389e2385f986 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate
+{ stdenv, fetchurl, SDL, ffmpeg, frei0r, jack2, libdv, libsamplerate
 , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2
+    SDL ffmpeg frei0r jack2 libdv libsamplerate libvorbis libxml2
     makeWrapper movit pkgconfig qt sox
   ];
 

From 55e6d092cae037062cd0de497dffc1c248f791ff Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 4 Aug 2014 22:05:54 +0200
Subject: [PATCH 088/107] ec2-ami-tools: Update from 1.4.0.9 to 1.5.3

---
 pkgs/tools/virtualization/ec2-ami-tools/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index 1f04229c2c82..cbe53326339a 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "ec2-ami-tools-1.4.0.9";
+  name = "ec2-ami-tools-${version}";
+
+  version = "1.5.3";
 
   buildInputs = [ unzip makeWrapper ];
 
   src = fetchurl {
-    url = "http://tarballs.nixos.org/${name}.zip";
-    sha256 = "0icpjr2ipch3f6cf4rg9x5z2y9k6a4rd85npsmw3a1ambs3dwxlq";
+    url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip";
+    sha256 = "0n184nxc57alg25h5bslg0cs1z854sf7f52a820ihxxknrq2dy6i";
   };
 
   # Amazon EC2 requires that disk images are writable.  If they're

From eaad8d6923a814092daa1cec9df14fa450bad0aa Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Sun, 6 Jul 2014 22:44:10 +0200
Subject: [PATCH 089/107] Packaging PyCharm IDE

---
 pkgs/applications/editors/idea/pycharm.nix | 113 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   3 +-
 2 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/editors/idea/pycharm.nix

diff --git a/pkgs/applications/editors/idea/pycharm.nix b/pkgs/applications/editors/idea/pycharm.nix
new file mode 100644
index 000000000000..d283686765ed
--- /dev/null
+++ b/pkgs/applications/editors/idea/pycharm.nix
@@ -0,0 +1,113 @@
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
+, coreutils, gnugrep, which, git, python
+}:
+
+let
+
+  buildPycharm =
+  { name, version, build, src, description, license }:
+
+  stdenv.mkDerivation rec {
+    inherit name build src;
+    desktopItem = makeDesktopItem {
+      name = "pycharm";
+      exec = "pycharm";
+      comment = "Powerful Python and Django IDE";
+      desktopName = "PyCharm";
+      genericName = "Powerful Python and Django IDE";
+      categories = "Application;Development;";
+    };
+
+    buildInputs = [ makeWrapper patchelf p7zip ];
+
+    propagatedUserEnvPkgs = [ python ];
+
+    patchPhase = ''
+      interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)"
+      snappyPath="lib/snappy-java-1.0.5"
+
+      7z x -o"$snappyPath" "$snappyPath.jar"
+      if [ "${stdenv.system}" == "x86_64-linux" ]; then
+        patchelf --set-interpreter "$interpreter" bin/fsnotifier64
+        patchelf --set-rpath ${stdenv.gcc.gcc}/lib64/ "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so"
+      else
+        patchelf --set-interpreter "$interpreter" bin/fsnotifier
+        patchelf --set-rpath ${stdenv.gcc.gcc}/lib/ "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so"
+      fi
+      7z a -tzip "$snappyPath.jar" ./"$snappyPath"/*
+      rm -vr "$snappyPath"
+    '';
+
+    installPhase = ''
+      mkdir -vp "$out/bin" "$out/$name"
+      cp -va . "$out/$name"
+
+      jdk="${jdk}/lib/openjdk"
+      makeWrapper "$out/$name/bin/pycharm.sh" "$out/bin/pycharm" \
+        --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
+        --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \
+        --prefix JDK_HOME : "$jdk" \
+        --prefix PYCHARM_JDK : "$jdk"
+
+      cp -a "${desktopItem}"/* "$out"
+    '';
+
+    meta = {
+      homepage = "https://www.jetbrains.com/pycharm/";
+      inherit description;
+      inherit license;
+      maintainers = [ stdenv.lib.maintainers.jgeerds ];
+      platforms = stdenv.lib.platforms.linux;
+    };
+  };
+
+in {
+
+  pycharm-community-313 = buildPycharm rec {
+    name = "pycharm-community-${version}";
+    version = "3.1.3";
+    build = "133.1347";
+    description = "PyCharm 3.1 Community Edition";
+    license = stdenv.lib.licenses.asl20;
+    src = fetchurl {
+      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "f671ee4c99207c179f168b5b98fa23afe90a94c3a3914367b95a46b0c2881b23";
+    };
+  };
+
+  pycharm-community-341 = buildPycharm rec {
+    name = "pycharm-community-${version}";
+    version = "3.4.1";
+    build = "135.1057";
+    description = "PyCharm 3.4 Community Edition";
+    license = stdenv.lib.licenses.asl20;
+    src = fetchurl {
+      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "96427b1e842e7c09141ec4d3ede627c5ca7d821c0d6c98169b56a34f9035ef64";
+    };
+  };
+
+  pycharm-professional-313 = buildPycharm rec {
+    name = "pycharm-professional-${version}";
+    version = "3.1.3";
+    build = "133.1347";
+    description = "PyCharm 3.1 Professional Edition";
+    license = stdenv.lib.licenses.unfree;
+    src = fetchurl {
+      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "e0c2db8f18cb825a95de6ddc4b0b9f93c5643bf34cca9f1b3c2fa37fd7c14f11";
+    };
+  };
+
+  pycharm-professional-341 = buildPycharm rec {
+    name = "pycharm-professional-${version}";
+    version = "3.4.1";
+    build = "135.1057";
+    description = "PyCharm 3.4 Professional Edition";
+    license = stdenv.lib.licenses.unfree;
+    src = fetchurl {
+      url = "http://download.jetbrains.com/python/${name}.tar.gz";
+      sha256 = "e4f85f3248e8985ac9f8c326543f979b47ba1d7ac6b128a2cf2b3eb8ec545d2b";
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a46693b92359..463027b2ac50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8777,7 +8777,8 @@ let
     libart = gnome2.libart_lgpl;
   }; # latest version: gnome3.goffice
 
-  ideas = recurseIntoAttrs (callPackage ../applications/editors/idea { });
+  ideas = recurseIntoAttrs (  (callPackage ../applications/editors/idea { })
+                           // (callPackage ../applications/editors/idea/pycharm.nix { }));
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 

From 310400e0f58e7682358718d377465dec8c0e4a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 5 Aug 2014 07:19:00 +0200
Subject: [PATCH 090/107] intellij-idea: don't access 'shortName' license
 attribute

I don't think packages should poke into the license attributes.
---
 pkgs/applications/editors/idea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 165510f39336..e5cfbcdfe178 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -8,7 +8,7 @@ let
   { name, version, build, src, description, license }:
 
   stdenv.mkDerivation rec {
-    inherit name build src license;
+    inherit name build src;
     ideaItem = makeDesktopItem {
       name = "IDEA";
       exec = "idea";
@@ -69,7 +69,7 @@ in {
     version = "13.1.3";
     build = "IC-135.909";
     description = "IntelliJ IDEA 13 Community Edition";
-    license = stdenv.lib.licenses.asl20.shortName;
+    license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
       sha256 = "62ed937ef68df16eef4d32772b6510835527f95020db1c76643f17ed2c067b51";

From d9e6c07c5b18fda79307f92693c25fb941665d32 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Aug 2014 10:25:42 +0200
Subject: [PATCH 091/107] Remove the containers test from the release-critical
 builds

Too many random failures...
---
 nixos/release-combined.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index f59f71b0d6f8..dae3b9210a86 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -42,8 +42,8 @@ in rec {
         (all nixos.iso_graphical)
         (all nixos.ova)
 
-        # (all nixos.tests.efi-installer.simple)
-        (all nixos.tests.containers)
+        #(all nixos.tests.efi-installer.simple)
+        #(all nixos.tests.containers)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)

From 6b670283835875eac42b9fa49b0833d3fb090264 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Aug 2014 10:43:25 +0200
Subject: [PATCH 092/107] cacert: Update to 20140715

This is generated with a more recent version of mk-ca-bundle.pl. The
previous version mistakenly dropped some certificates, like "Verisign
Class 3 Public Primary Certification Authority".
---
 pkgs/data/misc/cacert/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 7bb1e1d21d59..0a2c43fc5812 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cacert-20140704";
+  name = "cacert-20140715";
 
   src = fetchurl {
     url = "http://tarballs.nixos.org/${name}.pem.bz2";
-    sha256 = "05ymb7lrxavscbpx5xywlbya9q66r26fbngfif6zrvfpf3qskiza";
+    sha256 = "1l4j7z6ysnllx99isjzlc8zc34rbbgj4kzlg1y5sy9bgphc8cssl";
   };
 
   unpackPhase = "true";

From 542373f305ecda104827dc99daea8b01bf1876c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Aug 2014 11:41:32 +0200
Subject: [PATCH 093/107] serf: Update to 1.3.6

---
 pkgs/development/libraries/serf/default.nix   | 29 ++++++-------------
 .../libraries/serf/default.upstream           |  3 --
 2 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/development/libraries/serf/default.upstream

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index b511a841d190..409b5db01049 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,25 +1,15 @@
-{stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="serf";
-    version="1.3.3";
-    name="${baseName}-${version}";
-    hash="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2";
-    url="https://serf.googlecode.com/files/serf-1.3.3.tar.bz2";
-    sha256="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2";
-  };
-  buildInputs = [
-    apr scons openssl aprutil zlib krb5 pkgconfig
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
+{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "serf-1.3.6";
+
   src = fetchurl {
-    inherit (s) url sha256;
+    url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2";
+    sha256 = "1wk3cplazs8jznjc9ylpd63rrk9k2y05xa7zqx7psycr0gmpnqya";
   };
 
+  buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ];
+
   configurePhase = ''
     sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
     sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct
@@ -36,7 +26,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    inherit (s) version;
     description = "HTTP client library based on APR";
     license = stdenv.lib.licenses.asl20 ;
     maintainers = [stdenv.lib.maintainers.raskin];
diff --git a/pkgs/development/libraries/serf/default.upstream b/pkgs/development/libraries/serf/default.upstream
deleted file mode 100644
index a081905759e2..000000000000
--- a/pkgs/development/libraries/serf/default.upstream
+++ /dev/null
@@ -1,3 +0,0 @@
-url https://code.google.com/p/serf/downloads/list
-version_link '[.]tar[.][a-z0-9]+$'
-process 'code[.]google[.]com//' ''

From b4c4e2d28d84a69041dad19ded3ff4016992a3c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Aug 2014 11:46:04 +0200
Subject: [PATCH 094/107] subversion: Update to 1.8.9

---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index e699b82f2b0a..d183db5d0548 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
 
 stdenv.mkDerivation rec {
 
-  version = "1.8.8";
+  version = "1.8.9";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion/${name}.tar.bz2";
-    sha256 = "1cqxwydjidyf59y4lgkxl7bra1sy28abqm2mi5971qjsv0f96s8m";
+    sha1 = "424ee12708f39a126efd905886666083dcc4eeaf";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

From 69b426a1eb0957761df860100715084e903d454c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Aug 2014 11:47:16 +0200
Subject: [PATCH 095/107] php: Update to 5.4.31

---
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index c194c3aa8a07..bc5320ff77c0 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.30";
+  version = "5.4.31";
 
   name = "php-${version}";
 
@@ -243,7 +243,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   src = fetchurl {
     url = "http://www.php.net/distributions/php-${version}.tar.bz2";
-    sha256 = "1rkc977b4k0y6qg5nf8729g5zpica31h1isyds6khmrdwi23df1j";
+    sha256 = "0kci0yir923fc7dv7j9qrc10pj05v82jnxjxjbgrj7gx64a4k3jy";
   };
 
   meta = {

From 534a01c2b0199c21b6e08b3a5b38a9f5e7cd231f Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 30 Jul 2014 17:55:30 +0200
Subject: [PATCH 096/107] amazon ec2: Make fetch-ec2-data more robust

curl does not retry if it is unable to connect to the metadata server.
For some reason, when creating a new AMI with a recent nixpkgs, the
metadata server would not be available when fetch-ec2-data ran. Switching
to wget that can retry even on TCP connection errors solved this problem.

I also made the fetch-ec2-data depend on ip-up.target, to get it to start
a bit later.
---
 nixos/modules/virtualisation/ec2-data.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index 246d35065317..93a83a3e42af 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -22,21 +22,22 @@ with lib;
     systemd.services."fetch-ec2-data" =
       { description = "Fetch EC2 Data";
 
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "multi-user.target" "sshd.service" ];
         before = [ "sshd.service" ];
-        after = [ "network.target" ];
+        wants = [ "ip-up.target" ];
+        after = [ "ip-up.target" ];
 
-        path = [ pkgs.curl pkgs.iproute ];
+        path = [ pkgs.wget pkgs.iproute ];
 
         script =
           ''
             ip route del blackhole 169.254.169.254/32 || true
 
-            curl="curl --retry 3 --retry-delay 0 --fail"
+            wget="wget -q --retry-connrefused -O -"
 
             echo "setting host name..."
             ${optionalString (config.networking.hostName == "") ''
-              ${pkgs.nettools}/bin/hostname $($curl http://169.254.169.254/1.0/meta-data/hostname)
+              ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/1.0/meta-data/hostname)
             ''}
 
             # Don't download the SSH key if it has already been injected
@@ -44,7 +45,7 @@ with lib;
             if ! [ -e /root/.ssh/authorized_keys ]; then
                 echo "obtaining SSH key..."
                 mkdir -p /root/.ssh
-                $curl -o /root/key.pub http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+                $wget http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key > /root/key.pub
                 if [ $? -eq 0 -a -e /root/key.pub ]; then
                     if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
                         cat /root/key.pub >> /root/.ssh/authorized_keys
@@ -58,7 +59,7 @@ with lib;
             # Extract the intended SSH host key for this machine from
             # the supplied user data, if available.  Otherwise sshd will
             # generate one normally.
-            $curl http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
+            $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
             key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
             key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
             if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then

From 7a6ebb5420ec9f1fcb1e8b258ce698f8f8b0d7b1 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Tue, 5 Aug 2014 17:12:19 +0100
Subject: [PATCH 097/107] haskellPackages.genericsSop: New expression

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

diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix
new file mode 100644
index 000000000000..01ff07e2a306
--- /dev/null
+++ b/pkgs/development/libraries/haskell/generics-sop/default.nix
@@ -0,0 +1,14 @@
+{ cabal, tagged }:
+
+cabal.mkDerivation (self: {
+  pname = "generics-sop";
+  version = "0.1.0.2";
+  sha256 = "01s3v3a29wdsps9vas8in2ks5p4d2arqp3qvmzqa7v2sz786xjra";
+  buildDepends = [ tagged ];
+  meta = {
+    description = "Generic Programming using True Sums of Products";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5c676cdade51..d6cc4216bbbf 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -866,6 +866,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {};
 
+  genericsSop = callPackage ../development/libraries/haskell/generics-sop {};
+
   ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
 
   ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};

From 6103824dd7dac2385938a9af1e1e2b33355ca936 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Aug 2014 19:56:16 +0200
Subject: [PATCH 098/107] haskell-prelude-safeenum: add version 0.1.1.1

---
 .../haskell/prelude-safeenum/default.nix          | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/prelude-safeenum/default.nix

diff --git a/pkgs/development/libraries/haskell/prelude-safeenum/default.nix b/pkgs/development/libraries/haskell/prelude-safeenum/default.nix
new file mode 100644
index 000000000000..17674a5be56f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/prelude-safeenum/default.nix
@@ -0,0 +1,15 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "prelude-safeenum";
+  version = "0.1.1.1";
+  sha256 = "0cff77nbhy3dsamrwm2wxhbi1mf2bzkdd1pdzqv3klpbzjwkdszv";
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "A redefinition of the Prelude's Enum class in order to render it safe";
+    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 d6cc4216bbbf..84b129c95900 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1858,6 +1858,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {};
 
+  preludeSafeenum = callPackage ../development/libraries/haskell/prelude-safeenum {};
+
   preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {};
   preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {};
   preprocessorTools = self.preprocessorTools_1_0_1;

From 953de80aade07ccb9c1645a96f54dce3e97053f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Aug 2014 19:56:27 +0200
Subject: [PATCH 099/107] haskell-data-fin: add version 0.1.1.2

---
 .../libraries/haskell/data-fin/default.nix    | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/data-fin/default.nix

diff --git a/pkgs/development/libraries/haskell/data-fin/default.nix b/pkgs/development/libraries/haskell/data-fin/default.nix
new file mode 100644
index 000000000000..87b827e4518e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-fin/default.nix
@@ -0,0 +1,21 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
+{ cabal, lazysmallcheck, preludeSafeenum, QuickCheck, reflection
+, smallcheck, tagged
+}:
+
+cabal.mkDerivation (self: {
+  pname = "data-fin";
+  version = "0.1.1.2";
+  sha256 = "13qgqx3b01a8bm7jw7fkv7nyyzg2jkgg27zv2wp57g0nd5aw5hpn";
+  buildDepends = [
+    lazysmallcheck preludeSafeenum QuickCheck reflection smallcheck
+    tagged
+  ];
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Finite totally ordered sets";
+    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 84b129c95900..396e4acfa1d5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -574,6 +574,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
+  dataFin = callPackage ../development/libraries/haskell/data-fin {};
+
   dataFix = callPackage ../development/libraries/haskell/data-fix {};
 
   dataHash = callPackage ../development/libraries/haskell/data-hash {};

From 3b4fa2b53ba899794fe7c61f70e70a3012adc04a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Aug 2014 15:22:04 +0200
Subject: [PATCH 100/107] Re-generate expressions with cabal2nix.

---
 pkgs/development/libraries/haskell/ad/default.nix           | 2 ++
 pkgs/development/libraries/haskell/dom-selector/default.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix
index 39c17de2c313..d53d11385f4d 100644
--- a/pkgs/development/libraries/haskell/ad/default.nix
+++ b/pkgs/development/libraries/haskell/ad/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, comonad, dataReify, doctest, erf, filepath, free, mtl
 , nats, reflection, tagged, transformers
 }:
diff --git a/pkgs/development/libraries/haskell/dom-selector/default.nix b/pkgs/development/libraries/haskell/dom-selector/default.nix
index 789eb354b310..b9806ca4dc7b 100644
--- a/pkgs/development/libraries/haskell/dom-selector/default.nix
+++ b/pkgs/development/libraries/haskell/dom-selector/default.nix
@@ -1,3 +1,5 @@
+# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+
 { cabal, blazeHtml, htmlConduit, parsec, QuickCheck, text, thLift
 , xmlConduit
 }:

From 9ee6dd8cc472e8c32f88ef24799af7dbe4a82949 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Aug 2014 15:23:15 +0200
Subject: [PATCH 101/107] haskell-cuda: update to version 0.6.0.1

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

diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix
index 3abc6443c6e3..0be319aeff23 100644
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ b/pkgs/development/libraries/haskell/cuda/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cuda";
-  version = "0.6.0.0";
-  sha256 = "0zvyvk5yhwz7nl613yvfl32xnv9kgfdwbb0whyd6nrm663xa352y";
+  version = "0.6.0.1";
+  sha256 = "03wnkqgdvy6h2dqcmj0xlag3am3s3rjzhx0kqaq362mq365n9y51";
   buildTools = [ c2hs ];
   extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
   doCheck = false;

From b2808e08ce740f0aa6a4afce7d9a39bb606761c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Aug 2014 15:23:18 +0200
Subject: [PATCH 102/107] haskell-persistent: update to version 1.3.3

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

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 3647431bbb15..898bc13284da 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.3.1.1";
-  sha256 = "0na1mci7m8hzv40d5qc75dqdkw2kbw8i6xpjlpwgd1flznmqkdvx";
+  version = "1.3.3";
+  sha256 = "1pz3xdbk46qprcyb0sll5zzr2vp6x08w7pd5glz2jf2242k7cdrd";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
     exceptions liftedBase monadControl monadLogger pathPieces

From 6dc95596dbe311ca0e2f91465e1cad348bc8489b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Aug 2014 15:23:20 +0200
Subject: [PATCH 103/107] haskell-statistics: update to version 0.13.2.0

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

diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
index 4bb356a44434..42c88f973914 100644
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "statistics";
-  version = "0.13.1.1";
-  sha256 = "1ghb2snbacbfzxqcrvdiihvw2iip1m8rq9y62x1ayg6k13agm7r5";
+  version = "0.13.2.0";
+  sha256 = "0xxi0w7jxgj31zgwppvjx1iw80plrq2fxz6vaa9mr9ijqqi36xad";
   buildDepends = [
     aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive
     vector vectorAlgorithms vectorBinaryInstances

From f185bc447e4cc351355187bfc697acf71ba82c37 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Aug 2014 15:23:23 +0200
Subject: [PATCH 104/107] haskell-websockets-snap: update to version 0.8.2.2

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

diff --git a/pkgs/development/libraries/haskell/websockets-snap/default.nix b/pkgs/development/libraries/haskell/websockets-snap/default.nix
index 29fcc454112c..edc8f93cfe06 100644
--- a/pkgs/development/libraries/haskell/websockets-snap/default.nix
+++ b/pkgs/development/libraries/haskell/websockets-snap/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "websockets-snap";
-  version = "0.8.2.1";
-  sha256 = "13q1vrrcka91w9yad3jw1w68hp59n851hkn9a3hylw0cqs7008az";
+  version = "0.8.2.2";
+  sha256 = "1r5y5czpxrc06i7w3y3fa4dlqmxdypcc8yplg28cv4k3mkfa1hf4";
   buildDepends = [
     blazeBuilder enumerator ioStreams mtl snapCore snapServer
     websockets

From 628df3e4230543cfea8d631f19f31187ab98655e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Aug 2014 20:01:50 +0200
Subject: [PATCH 105/107] haskell-data-fin: jailbreak to fix build with
 reflection 1.5.x

---
 pkgs/development/libraries/haskell/data-fin/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/data-fin/default.nix b/pkgs/development/libraries/haskell/data-fin/default.nix
index 87b827e4518e..3c0d77e1a7a8 100644
--- a/pkgs/development/libraries/haskell/data-fin/default.nix
+++ b/pkgs/development/libraries/haskell/data-fin/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     lazysmallcheck preludeSafeenum QuickCheck reflection smallcheck
     tagged
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://code.haskell.org/~wren/";
     description = "Finite totally ordered sets";

From beddd36c953f98e95164bdff20b0a6ead61ad71c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 2 Aug 2014 17:50:28 -0500
Subject: [PATCH 106/107] nixos/stage-1: Don't check resilient filesystems

---
 nixos/modules/system/boot/stage-1-init.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 1b51c11e351a..73fc6ce543cf 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -194,6 +194,9 @@ checkFS() {
     # Don't check ROM filesystems.
     if [ "$fsType" = iso9660 -o "$fsType" = udf ]; then return 0; fi
 
+    # Don't check resilient COWs as they validate the fs structures at mount time
+    if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi
+
     # If we couldn't figure out the FS type, then skip fsck.
     if [ "$fsType" = auto ]; then
         echo 'cannot check filesystem with type "auto"!'

From 560a235c956b15b88045f9e710ace55145ffa6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 5 Aug 2014 23:23:09 +0200
Subject: [PATCH 107/107] python-robotframework: update from 2.8.4 to 2.8.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 31f0875b5f27..b01f0b50483b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6720,12 +6720,12 @@ rec {
 
 
   robotframework = buildPythonPackage rec {
-    version = "2.8.4";
+    version = "2.8.5";
     name = "robotframework-${version}";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz";
-      sha256 = "0rxk135c1051cwv45219ib3faqvi5rl50l98ncb83c7qxy92jg2n";
+      sha256 = "0rzdn2gvmcrxs2fvxm11h55w4j5pv0lf443fc4hl8kzwjwgjckga";
     };
 
     # error: invalid command 'test'