From 092e6e23b374929ce4bc8d7a8bd6c92beba09560 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Thu, 9 Jul 2015 17:54:47 -0700
Subject: [PATCH 001/123] junegunn.go-runewidth: init at travisish

patch by @magnetophon
---
 pkgs/top-level/go-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index bab63e87b30..bd0b95073c5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1366,6 +1366,18 @@ let
     };
   };
 
+  junegunn.go-runewidth = buildGoPackage rec {
+    rev = "travisish";
+    name = "go-runewidth-${rev}";
+    goPackagePath = "github.com/junegunn/go-runewidth";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "junegunn";
+      repo = "go-runewidth";
+      sha256 = "07d612val59sibqly5d6znfkp4h4gjd77783jxvmiq6h2fwb964k";
+    };
+  };
+
   go-runit = buildGoPackage rec {
     rev = "a9148323a615e2e1c93b7a9893914a360b4945c8";
     name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}";

From 2d006f090e2a516018ebd8f217870194aa76dc48 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Thu, 9 Jul 2015 18:02:25 -0700
Subject: [PATCH 002/123] go-shellwords: init at
 35d512af75e283aae4ca1fc3d44b159ed66189a4

patch by @magnetophon
---
 pkgs/top-level/go-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index bd0b95073c5..77d96053e94 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1378,6 +1378,18 @@ let
     };
   };
 
+  go-shellwords = buildGoPackage rec {
+    rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4";
+    name = "go-shellwords-${rev}";
+    goPackagePath = "github.com/junegunn/go-shellwords";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "junegunn";
+      repo = "go-shellwords";
+      sha256 = "c792abe5fda48d0dfbdc32a84edb86d884a0ccbd9ed49ad48a30cda5ba028a22";
+    };
+  };
+
   go-runit = buildGoPackage rec {
     rev = "a9148323a615e2e1c93b7a9893914a360b4945c8";
     name = "go-runit-${stdenv.lib.strings.substring 0 7 rev}";

From fb371c06427b779213488808119216671cba5a26 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Thu, 9 Jul 2015 18:03:22 -0700
Subject: [PATCH 003/123] fzf: init at 0.9.13

patch by @magnetophon
---
 pkgs/tools/misc/fzf/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/misc/fzf/default.nix

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
new file mode 100644
index 00000000000..58c2871ae85
--- /dev/null
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, goPackages, syncthing, ncurses }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "fzf-${version}";
+  version = "0.9.13";
+  goPackagePath = "github.com/junegunn/fzf";
+  src = fetchFromGitHub {
+    owner = "junegunn";
+    repo = "fzf";
+    rev = "${version}";
+    sha256 = "1m9zbf02d6i47c33jys9lr0krqfjk2dr8jzpfhnrb266qcdb27xi";
+  };
+
+  buildInputs = with goPackages; [ crypto ginkgo gomega junegunn.go-runewidth go-shellwords ncurses syncthing text ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/junegunn/fzf;
+    description = "A command-line fuzzy finder written in Go";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6ad3607854..2b9e6d6610a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -878,6 +878,8 @@ let
 
   filter_audio = callPackage ../development/libraries/filter_audio { };
 
+  fzf = callPackage ../tools/misc/fzf { };
+
   gist = callPackage ../tools/text/gist { };
 
   mcrl = callPackage ../tools/misc/mcrl { };

From 9e2da99cc7f58d020673b05f72a5249579cb1cd1 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Fri, 10 Jul 2015 10:52:23 -0700
Subject: [PATCH 004/123] fzf: whitespace

---
 pkgs/tools/misc/fzf/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 58c2871ae85..938a72b74a7 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -13,7 +13,16 @@ buildGoPackage rec {
     sha256 = "1m9zbf02d6i47c33jys9lr0krqfjk2dr8jzpfhnrb266qcdb27xi";
   };
 
-  buildInputs = with goPackages; [ crypto ginkgo gomega junegunn.go-runewidth go-shellwords ncurses syncthing text ];
+  buildInputs = with goPackages; [
+    crypto
+    ginkgo
+    gomega
+    junegunn.go-runewidth
+    go-shellwords
+    ncurses
+    syncthing
+    text
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/junegunn/fzf;

From ec6e64a371f41887c45c23a9a693cfe586e0616f Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Sat, 11 Jul 2015 10:30:51 -0700
Subject: [PATCH 005/123] fzf: add magnetophon as a maintainer

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 938a72b74a7..6b703a3e902 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -28,5 +28,6 @@ buildGoPackage rec {
     homepage = https://github.com/junegunn/fzf;
     description = "A command-line fuzzy finder written in Go";
     license = licenses.mit;
+    maintainers = [ maintainers.magnetophon ];
   };
 }

From d6cee31b04d038785139360fee8988c422baeb53 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 13 Jul 2015 06:56:53 -0700
Subject: [PATCH 006/123] heyefi service: init

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/heyefi.nix | 87 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 3 files changed, 90 insertions(+)
 create mode 100644 nixos/modules/services/networking/heyefi.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f74b16f678f..a03cd732c17 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -286,6 +286,7 @@
   ./services/networking/gogoclient.nix
   ./services/networking/gvpe.nix
   ./services/networking/haproxy.nix
+  ./services/networking/heyefi.nix
   ./services/networking/hostapd.nix
   ./services/networking/i2pd.nix
   ./services/networking/i2p.nix
diff --git a/nixos/modules/services/networking/heyefi.nix b/nixos/modules/services/networking/heyefi.nix
new file mode 100644
index 00000000000..741851a8ff4
--- /dev/null
+++ b/nixos/modules/services/networking/heyefi.nix
@@ -0,0 +1,87 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.heyefi;
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.heyefi = {
+
+      cardMacaddress = mkOption {
+        default = "";
+        description = ''
+          An Eye-Fi card MAC address.
+          '';
+      };
+
+      uploadKey = mkOption {
+        default = "";
+        description = ''
+          An Eye-Fi card's upload key.
+          '';
+      };
+
+      uploadDir = mkOption {
+        example = /home/ryantm/picture;
+        description = ''
+          The directory to upload the files to.
+          '';
+      };
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Enable heyefi, an Eye-Fi upload server.
+        '';
+      };
+
+      user = mkOption {
+        default = "root";
+        description = ''
+          heyefi will be run under this user (user must exist,
+          this can be your user name).
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.heyefi =
+      {
+        description = "heyefi service";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          User = "${cfg.user}";
+          Restart = "always";
+          ExecStart = "${pkgs.heyefi}/bin/heyefi";
+        };
+
+      };
+
+    environment.etc."heyefi/heyefi.config".text =
+      ''
+        # /etc/heyefi/heyefi.conf: DO NOT EDIT -- this file has been generated automatically.
+        cards = [["${config.services.heyefi.cardMacaddress}","${config.services.heyefi.uploadKey}"]]
+        upload_dir = "${toString config.services.heyefi.uploadDir}"
+      '';
+
+    environment.systemPackages = [ pkgs.heyefi ];
+
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6ad3607854..8bf28b89b5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6523,6 +6523,8 @@ let
 
   herqq = callPackage ../development/libraries/herqq { };
 
+  heyefi = haskellPackages.heyefi;
+
   hidapi = callPackage ../development/libraries/hidapi {
     libusb = libusb1;
   };

From d11edff86088569e82d3947227cae96790438494 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 14 Jul 2015 06:54:51 -0700
Subject: [PATCH 007/123] heyefi service: use mkEnableOption

---
 nixos/modules/services/networking/heyefi.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/heyefi.nix b/nixos/modules/services/networking/heyefi.nix
index 741851a8ff4..0f55c1a5b8f 100644
--- a/nixos/modules/services/networking/heyefi.nix
+++ b/nixos/modules/services/networking/heyefi.nix
@@ -15,6 +15,8 @@ in
 
     services.heyefi = {
 
+      enable = mkEnableOption "heyefi";
+
       cardMacaddress = mkOption {
         default = "";
         description = ''
@@ -36,13 +38,6 @@ in
           '';
       };
 
-      enable = mkOption {
-        default = false;
-        description = ''
-          Enable heyefi, an Eye-Fi upload server.
-        '';
-      };
-
       user = mkOption {
         default = "root";
         description = ''

From 9d485d9433e98a7cde0be4867d844c42ac373ad5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 14 Jul 2015 06:56:30 -0700
Subject: [PATCH 008/123] heyefi service: make uploadDir path more generic and
 a string

---
 nixos/modules/services/networking/heyefi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/heyefi.nix b/nixos/modules/services/networking/heyefi.nix
index 0f55c1a5b8f..fc2b5a84857 100644
--- a/nixos/modules/services/networking/heyefi.nix
+++ b/nixos/modules/services/networking/heyefi.nix
@@ -32,7 +32,7 @@ in
       };
 
       uploadDir = mkOption {
-        example = /home/ryantm/picture;
+        example = "/home/username/pictures";
         description = ''
           The directory to upload the files to.
           '';

From 17c1428bfb9a5cb7cefeb378fb5fb4cb8301a5d8 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Wed, 15 Jul 2015 19:59:20 -0700
Subject: [PATCH 009/123] fzf: 0.9.13 -> 0.10.0

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 6b703a3e902..5692fc25a32 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -4,13 +4,13 @@ with goPackages;
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.9.13";
+  version = "0.10.0";
   goPackagePath = "github.com/junegunn/fzf";
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "${version}";
-    sha256 = "1m9zbf02d6i47c33jys9lr0krqfjk2dr8jzpfhnrb266qcdb27xi";
+    sha256 = "0dx9qwmcrnh31m2n75qmpj1dxm6rr6xsbazy4nwa3bzrb8y6svh2";
   };
 
   buildInputs = with goPackages; [

From ce50f2b398e7e095e3106e5c3e20f540fb0ee5aa Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 20 Jul 2015 10:58:49 +0000
Subject: [PATCH 010/123] pythonPackages.netcdf4: init at 1.1.8

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 222b9150511..5b565d1242b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3965,6 +3965,41 @@ let
     };
   };
 
+  netcdf4 = buildPythonPackage rec {
+    name = "netCDF4-${version}";
+    version = "1.1.8";
+
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/n/netCDF4/${name}.tar.gz";
+      sha256 = "0y6s8g82rbij0brh9hz3aapyyq6apj8fpmhhlyibz1354as7rjq1";
+    };
+
+    propagatedBuildInputs = with self ; [
+      numpy
+      pkgs.zlib
+      pkgs.netcdf
+      pkgs.hdf5
+      pkgs.curl
+      pkgs.libjpeg
+    ];
+
+    patchPhase = ''
+      export USE_NCCONFIG=0
+      export HDF5_DIR="${pkgs.hdf5}"
+      export NETCDF4_DIR="${pkgs.netcdf}"
+      export CURL_DIR="${pkgs.curl}"
+      export JPEG_DIR="${pkgs.libjpeg}"
+    '';
+
+    meta = {
+      description = "interface to netCDF library (versions 3 and 4)";
+      homepage = https://pypi.python.org/pypi/netCDF4;
+      license = licenses.free;  # Mix of license (all MIT* like)
+    };
+  };
+
   odfpy = buildPythonPackage rec {
     version = "0.9.6";
     name = "odfpy-${version}";

From f32f52c208cb97246034190158dd6512915e5316 Mon Sep 17 00:00:00 2001
From: James Felix Black <james_black@apple.com>
Date: Mon, 20 Jul 2015 11:52:18 -0400
Subject: [PATCH 011/123] gxmessage: init at 3.4.3

A dropin replacement for xmessage, built against GTK+3.
---
 pkgs/applications/misc/gxmessage/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/misc/gxmessage/default.nix

diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
new file mode 100644
index 00000000000..ce8109717d4
--- /dev/null
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo}:
+
+stdenv.mkDerivation rec {
+  name = "gxmessage-${version}";
+  version = "3.4.3";
+
+  src = fetchurl {
+    url = "http://homepages.ihug.co.nz/~trmusson/stuff/${name}.tar.gz";
+    sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
+  };
+
+  buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ];
+  meta = {
+    description = "a GTK enabled dropin replacement for xmessage";
+    homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [jfb];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea85bd3547b..b984482a453 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11607,6 +11607,8 @@ let
 
   guvcview = callPackage ../os-specific/linux/guvcview { };
 
+  gxmessage = callPackage ../applications/misc/gxmessage { };
+
   hackrf = callPackage ../applications/misc/hackrf { };
 
   hello = callPackage ../applications/misc/hello/ex-2 { };

From 1173278f3462673dccd20b8be95cb1281a64f815 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 10 Jul 2015 00:17:38 +0200
Subject: [PATCH 012/123] ProofGeneral: 4.3pre131011 -> 4.3pre150313

---
 .../editors/emacs-modes/proofgeneral/4.3pre.nix             | 6 +++---
 pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
index 96d7619d387..815863ac6da 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
 
 stdenv.mkDerivation (rec {
-  name = "ProofGeneral-4.3pre131011";
+  name = "ProofGeneral-4.3pre150313";
 
   src = fetchurl {
-    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.3pre131011.tgz;
-    sha256 = "0104iy2xik5npkdg9p2ir6zqyrmdc93azrgm3ayvg0z76vmnb816";
+    url = "http://proofgeneral.inf.ed.ac.uk/releases/${name}.tgz";
+    sha256 = "1jq5ykkk14xr5qcn4kyxmi5ls0fibr0y47gfygzm1mzrfvz9aw3f";
   };
 
   sourceRoot = name;
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
index c733911118d..704e4b6c8c7 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
@@ -7,7 +7,7 @@ diff -r c7d8bfff4c0a bin/proofgeneral
  if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then
 -    # default relative to this script, otherwise PGHOMEDEFAULT
 -    MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`"
--    if [ -d "$MYDIR" ]; then
+-    if [ -d "$MYDIR/generic" ]; then
 -	PGHOME="$MYDIR"
 -    elif [ -d "$PGHOMEDEFAULT" ]; then
 +    if [ -d "$PGHOMEDEFAULT" ]; then

From 53c2254aab7cac1519689b70e0bb67cd87b82d78 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 31 May 2015 18:33:12 +0200
Subject: [PATCH 013/123] links2: 2.8 -> 2.10

Also enable svg support, as well as libev support
---
 .../networking/browsers/links2/default.nix             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 9b9d9ab6db1..dcc61d4061d 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
-, gpm, openssl, pkgconfig # Misc.
-, libpng, libjpeg, libtiff # graphic formats
+, gpm, openssl, pkgconfig, libev # Misc.
+, libpng, libjpeg, libtiff, librsvg # graphic formats
 , bzip2, zlib, xz # Transfer encodings
 , enableFB ? true
 , enableDirectFB ? false, directfb
@@ -8,16 +8,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.8";
+  version = "2.10";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "15h07498z52jfdahzgvkphg1f7qvxnpbyfn2xmsls0d2dwwdll3r";
+    sha256 = "0lqxg55sp1kphl7ykm2km0s2vsn92a0gmlgypmkqb984r060n3l4";
   };
 
   buildInputs =
-    [ libpng libjpeg libtiff gpm openssl xz bzip2 zlib ]
+    [ libev librsvg libpng libjpeg libtiff gpm openssl xz bzip2 zlib ]
     ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
     ++ stdenv.lib.optional enableDirectFB [ directfb ];
 

From b655b1c49dd9df2ecca1b7f6faa39fae10eef18b Mon Sep 17 00:00:00 2001
From: Andraz Brodnik <brodul@brodul.org>
Date: Tue, 21 Jul 2015 20:41:13 +0200
Subject: [PATCH 014/123] Add borg backup software (fork of attic)

Borg is a fork of attic backup software. It is more actively developed,
with more features.
---
 pkgs/tools/backup/borg/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/backup/borg/default.nix

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
new file mode 100644
index 00000000000..f9a949f4d3f
--- /dev/null
+++ b/pkgs/tools/backup/borg/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchzip, python3Packages, openssl, acl }:
+
+python3Packages.buildPythonPackage rec {
+  name = "borg-${version}";
+  version = "0.23.0";
+  namePrefix = "";
+
+  src = fetchzip {
+    name = "${name}-src";
+    url = "https://github.com/borgbackup/borg/archive/${version}.tar.gz";
+    sha256 = "1ns00bhrh4zm1s70mm32gnahj7yh4jdpkb8ziarhvcnknz7aga67";
+  };
+
+  propagatedBuildInputs = with python3Packages;
+    [ cython msgpack openssl acl llfuse tox detox ];
+
+  preConfigure = ''
+    export BORG_OPENSSL_PREFIX="${openssl}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A deduplicating backup program (attic fork)";
+    homepage = https://borgbackup.github.io/;
+    license = licenses.bsd3;
+    platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d66ebf21e1a..d9b21deca55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -755,6 +755,8 @@ let
 
   bochs = callPackage ../applications/virtualization/bochs { };
 
+  borg = callPackage ../tools/backup/borg { };
+
   boomerang = callPackage ../development/tools/boomerang { };
 
   boost-build = callPackage ../development/tools/boost-build { };

From 604dfd33f4312786485c2ff9b5f2304ba9e23ea7 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 22 Jul 2015 02:33:35 +0200
Subject: [PATCH 015/123] i2p: 0.9.19 -> 0.9.20

---
 pkgs/tools/networking/i2p/default.nix | 15 ++++++-----
 pkgs/tools/networking/i2p/i2p.patch   | 39 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/tools/networking/i2p/i2p.patch

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index b5ef06c34ea..1ef159131af 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,12 +1,13 @@
 { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.19";
+  name = "i2p-0.9.20";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936";
+    sha256 = "10rynkl9dbnfl67ck3d7wdwz52h7354r7nbwcypsjnng4f1dmj5s";
   };
   buildInputs = [ jdk ant gettext which ];
+  patches = [ ./i2p.patch ];
   buildPhase = ''
     export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
     ant preppkg-linux-only
@@ -17,15 +18,15 @@ stdenv.mkDerivation rec {
     cp -r pkg-temp/* $out
     cp installer/lib/wrapper/linux64/* $out
     sed -i $out/i2prouter -i $out/runplain.sh \
-      -e "s#%INSTALL_PATH#$out#" \
+      -e "s#uname#${coreutils}/bin/uname#" \
+      -e "s#which#${which}/bin/which#" \
+      -e "s#%gettext%#${gettext}/bin/gettext#" \
       -e "s#/usr/ucb/ps#${procps}/bin/ps#" \
       -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \
+      -e "s#%INSTALL_PATH#$out#" \
       -e 's#%USER_HOME#$HOME#' \
       -e "s#%SYSTEM_java_io_tmpdir#/tmp#" \
-      -e 's#JAVA=java#JAVA=${jre}/bin/java#'
-    sed -i $out/runplain.sh \
-      -e "s#nohup \(.*Launch\) .*#\1#" \
-      -e "s#echo \$\! .*##"
+      -e "s#%JAVA%#${jre}/bin/java#"
     mv $out/runplain.sh $out/bin/i2prouter-plain
     mv $out/man $out/share/
     chmod +x $out/bin/* $out/i2psvc
diff --git a/pkgs/tools/networking/i2p/i2p.patch b/pkgs/tools/networking/i2p/i2p.patch
new file mode 100644
index 00000000000..2ae6446ed28
--- /dev/null
+++ b/pkgs/tools/networking/i2p/i2p.patch
@@ -0,0 +1,39 @@
+--- a/installer/resources/runplain.sh
++++ b/installer/resources/runplain.sh
+@@ -21,7 +21,7 @@
+ 
+ # Try using the Java binary that I2P was installed with.
+ # If it's not found, try looking in the system PATH.
+-JAVA=$(which %JAVA_HOME/bin/java || which java)
++JAVA=%JAVA%
+ 
+ if [ -z $JAVA ] || [ ! -x $JAVA ]; then
+     echo "Error: Cannot find java." >&2
+@@ -40,15 +40,4 @@
+     export JAVA_TOOL_OPTIONS="-Djava.awt.headless=true"
+ fi
+ JAVAOPTS="-Djava.net.preferIPv4Stack=${PREFERv4} -Djava.library.path=${I2P}:${I2P}/lib -Di2p.dir.base=${I2P} -DloggerFilenameOverride=logs/log-router-@.txt"
+-(
+-    nohup ${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch > /dev/null 2>&1
+-) &
+-PID=$!
+-
+-if [ ! -z $PID ] && kill -0 $PID > /dev/null 2>&1 ; then
+-    echo "I2P started [$PID]" >&2
+-    echo $PID > "${I2PTEMP}/router.pid"
+-else
+-    echo "I2P failed to start." >&2
+-    exit 1
+-fi
++${JAVA} -cp \"${CP}\" ${JAVAOPTS} net.i2p.router.RouterLaunch
+--- a/installer/resources/i2prouter
++++ b/installer/resources/i2prouter
+@@ -49,7 +49,7 @@
+ 
+ # gettext - we look for it in the path
+ # fallback to echo is below, we can't set it to echo here.
+-GETTEXT=$(which gettext > /dev/null 2>&1)
++GETTEXT=%gettext%
+ 
+ # Where to install the systemd service
+ SYSTEMD_SERVICE="/etc/systemd/system/${APP_NAME}.service"

From bb823e900a4b78252dda8a7cf9c940b93fb4c81c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 22 Jul 2015 09:23:53 +0000
Subject: [PATCH 016/123] kde4.digikam: 4.10.0 -> 4.11.0

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

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index f86d3056db9..cfc15ed87bf 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-4.10.0";
+  name = "digikam-4.11.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
-    sha256 = "4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725";
+    sha256 = "1nak3w0717fpbpmklzd3xkkbp2mwi44yxnc789wzmi9d8z9n3jwh";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];

From fc23e58260dc791762c75fa8abc92296b359a976 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Wed, 22 Jul 2015 11:37:14 +0300
Subject: [PATCH 017/123] zc_buildout_nix: 2.2.1 -> 2.4.0

---
 .../python-modules/buildout-nix/default.nix   |  6 +--
 .../python-modules/buildout-nix/nix.patch     | 47 +++++--------------
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 43e8a45c0cf..e96429e4033 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, buildPythonPackage }:
 
 buildPythonPackage {
-  name = "zc.buildout-nix-2.2.1";
+  name = "zc.buildout-nix-2.4.0";
 
   src = fetchurl {
-    url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.1.tar.gz";
-    md5 = "476a06eed08506925c700109119b6e41";
+    url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.4.0.tar.gz";
+    md5 = "b8323b1ad285544de0c3dc14ee76ddd3";
   };
 
   patches = [ ./nix.patch ];
diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch
index dd3b8e12aa8..f358544d36a 100644
--- a/pkgs/development/python-modules/buildout-nix/nix.patch
+++ b/pkgs/development/python-modules/buildout-nix/nix.patch
@@ -1,38 +1,15 @@
 --- a/src/zc/buildout/easy_install.py	2013-08-27 22:28:40.233718116 +0200
 +++ b/src/zc/buildout/easy_install.py   2013-10-07 00:29:31.077413935 +0200
-@@ -508,16 +508,31 @@
-                         self._dest, os.path.basename(dist.location))
+@@ -227,6 +227,12 @@
  
-                     if os.path.isdir(dist.location):
--                        # we got a directory. It must have been
--                        # obtained locally.  Just copy it.
--                        shutil.copytree(dist.location, newloc)
-+                        # Replace links to garbage collected eggs in
-+                        # /nix/store
-+                        if os.path.islink(newloc):
-+                            # It seems necessary to jump through these
-+                            # hoops, otherwise we end up in an
-+                            # infinite loop because
-+                            # self._env.best_match fails to find the dist
-+                            os.remove(newloc)
-+                            dist = self._fetch(avail, tmp, self._download_cache)
-+                            os.symlink(dist.location, newloc)
-+                            newdist = pkg_resources.Distribution.from_filename(
-+                                newloc)
-+                            self._env.add(newdist)
-+                            logger.info("Updated link to %s" %dist.location)
-+                        # Symlink to the egg in /nix/store
-+                        elif not os.path.exists(newloc):
-+                            os.symlink(dist.location, newloc)
-+                            logger.info("Created link to %s" %dist.location)
-                     else:
- 
- 
-                         setuptools.archive_util.unpack_archive(
-                             dist.location, newloc)
- 
--                    redo_pyc(newloc)
-+                        redo_pyc(newloc)
- 
-                     # Getting the dist from the environment causes the
-                     # distribution meta data to be read.  Cloning isn't
+     def _satisfied(self, req, source=None):
+         dists = [dist for dist in self._env[req.project_name] if dist in req]
++        try:
++            dists = ([dist for dist in dists
++                     if dist.precedence == pkg_resources.DEVELOP_DIST]
++                     + [pkg_resources.get_distribution(req.project_name)])
++        except pkg_resources.DistributionNotFound:
++            pass
+         if not dists:
+             logger.debug('We have no distributions for %s that satisfies %r.',
+                          req.project_name, str(req))

From 784025c7475610fb2fe8e28044d9d50bec1d93d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 19:41:00 +0200
Subject: [PATCH 018/123] gfortran: update to 4.9.x

---
 pkgs/top-level/all-packages.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c14725cce1..094005f6e5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3839,7 +3839,7 @@ let
     isl = isl_0_14;
   }));
 
-  gfortran = if !stdenv.isDarwin then gfortran48
+  gfortran = if !stdenv.isDarwin then gfortran49
              else callPackage ../development/compilers/gcc/gfortran-darwin.nix {};
 
   gfortran48 = wrapCC (gcc48.cc.override {
@@ -3850,6 +3850,14 @@ let
     profiledCompiler = false;
   });
 
+  gfortran49 = wrapCC (gcc49.cc.override {
+    name = "gfortran";
+    langFortran = true;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+  });
+
   gcj = gcj48;
 
   gcj48 = wrapCC (gcc48.cc.override {

From b8275838317403a92a36eebcc7d67b90ecd876e5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 11:26:59 -0700
Subject: [PATCH 019/123] sudo: 1.8.14p1 -> 1.8.14p3

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

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 69ef5328868..8c9d3533346 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.14p1";
+  name = "sudo-1.8.14p3";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "1806kxnkjibky8y04s4f9mpj0403v4b6sqdnmyaa98mnq3qwsb5i";
+    sha256 = "0dqj1bq2jr4jxqfrd5yg0i42a6268scd0l28jic9118kn75rg9m8";
   };
 
   configureFlags = [

From 92150ef3acb79e3278f01d76b7f0a3f5234394a8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 22 Jul 2015 20:27:39 +0200
Subject: [PATCH 020/123] zerotierone: doesn't build on i686 (ZHF)

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

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 78c72967880..b08edaa0fc6 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.zerotier.com;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.sjmackenzie ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = with stdenv.lib; platforms.allBut [ "i686-linux" ];
   };
 }

From e770d66a231472b3231859e664a6e0ca2a7a3e24 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 22 Jul 2015 21:07:16 +0200
Subject: [PATCH 021/123] swell-loop: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  6 ++++
 .../gnome-3/3.16/games/swell-foop/default.nix | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index cc825f0cc6c..bcabd9140a8 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -32,6 +32,8 @@ let
     nautilus-sendto dconf-editor vinagre
   ];
 
+  gamesPackages = with gnome3; [ swell-foop ];
+
   inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
   orbit = ORBit2;
@@ -279,6 +281,10 @@ let
 
   gdl = callPackage ./devtools/gdl { };
 
+#### Games
+
+  swell-foop = callPackage ./games/swell-foop { };
+
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
   california = callPackage ./misc/california { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
new file mode 100644
index 00000000000..4afe66ee545
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
+, clutter, clutter_gtk, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "swell-foop-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/swell-foop/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0bhjmjcjsqdb89shs0ygi6ps5hb3lk8nhrbjnsjk4clfqbw0jzwf";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+                  makeWrapper itstool intltool clutter clutter_gtk libxml2 ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/swell-foop" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
+    description = "Puzzle game, previously known as Same GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From 7098832c6057cce376dc5d02532642d32a189d37 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 22 Jul 2015 21:20:44 +0200
Subject: [PATCH 022/123] lightsoff: init at 3.16.1.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  4 ++-
 .../gnome-3/3.16/games/lightsoff/default.nix  | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index bcabd9140a8..641a43b8417 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -32,7 +32,7 @@ let
     nautilus-sendto dconf-editor vinagre
   ];
 
-  gamesPackages = with gnome3; [ swell-foop ];
+  gamesPackages = with gnome3; [ swell-foop lightsoff ];
 
   inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
@@ -285,6 +285,8 @@ let
 
   swell-foop = callPackage ./games/swell-foop { };
 
+  lightsoff = callPackage ./games/lightsoff { };
+
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
   california = callPackage ./misc/california { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
new file mode 100644
index 00000000000..e24f90812c0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
+, intltool, itstool, clutter, clutter_gtk, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "lightsoff-${gnome3.version}.1.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/lightsoff/${gnome3.version}/${name}.tar.xz";
+    sha256 = "00a2jv7wr6fxrzk7avwa0wspz429ad7ri7v95jv31nqn5q73y4c0";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+                  libxml2 clutter clutter_gtk makeWrapper itstool intltool ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/lightsoff" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Lightsoff;
+    description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From b6cd7e754bcedfc9b0331ec9a5101764841ce6b4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 12:20:58 -0700
Subject: [PATCH 023/123] spl_git: 2015-06-29 -> 2015-07-21

---
 pkgs/os-specific/linux/spl/git.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix
index b2a2f9ffebc..9faba199a5d 100644
--- a/pkgs/os-specific/linux/spl/git.nix
+++ b/pkgs/os-specific/linux/spl/git.nix
@@ -1,12 +1,13 @@
-{ callPackage, fetchgit, ... } @ args:
+{ callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-06-29";
+  version = "2015-07-21";
 
-  src = fetchgit {
-    url = git://github.com/zfsonlinux/spl.git;
-    rev = "77ab5dd33a99bdf7fb062f0ea327582236a225b3";
-    sha256 = "1hbn8hi305cn15nlcm9x99nczjqjkhdc38hzww11xn78py8d90w9";
+  src = fetchFromGitHub {
+    owner = "zfsonlinux";
+    repo = "spl";
+    rev = "9eb361aaa537724c9a90ab6a9f33521bfd80bad9";
+    sha256 = "18sv4mw85fbm8i1s8k4y5dc43l6ll2f6hgfrawvzgvwni5i4h7n8";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From c034e966bfee7195a9620b729d55d9bd6d6634f2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 12:21:25 -0700
Subject: [PATCH 024/123] zfs_git: 2015-05-13 -> 2015-07-21

---
 pkgs/os-specific/linux/zfs/generic.nix |  6 ++++++
 pkgs/os-specific/linux/zfs/git.nix     | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 1613dcb311a..e2e574ee591 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
     "--with-udevdir=$(out)/lib/udev"
     "--with-systemdunitdir=$(out)/etc/systemd/system"
     "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
+    "--with-mounthelperdir=$(out)/bin"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--enable-systemd"
@@ -69,6 +70,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "DEFAULT_INITCONF_DIR=\${out}/default"
+  ];
+
   postInstall = ''
     # Prevent kernel modules from depending on the Linux -dev output.
     nuke-refs $(find $out -name "*.ko")
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 130a02c86e8..26c48076c4e 100644
--- a/pkgs/os-specific/linux/zfs/git.nix
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -1,12 +1,13 @@
-{ callPackage, stdenv, fetchgit, spl_git, ... } @ args:
+{ callPackage, stdenv, fetchFromGitHub, spl_git, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-05-13";
+  version = "2015-07-21";
 
-  src = fetchgit {
-    url = git://github.com/zfsonlinux/zfs.git;
-    rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c";
-    sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437";
+  src = fetchFromGitHub {
+    owner = "zfsonlinux";
+    repo = "zfs";
+    rev = "3b79cef21294f3ec46c4f71cc5a68a75a4d0ebc7";
+    sha256 = "01l4cg62wgn3wzasskx2nh3a4c74vq8qcwz090x8x1r4c2r4v943";
   };
 
   patches = [ ./nix-build.patch ];

From 2a36f709d3590e80999b311649c37f8758fd7d94 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 22 Jul 2015 21:25:46 +0200
Subject: [PATCH 025/123] iagno: init at 3.16.1

---
 pkgs/desktops/gnome-3/3.16/default.nix        |  6 ++--
 .../gnome-3/3.16/games/iagno/default.nix      | 31 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/3.16/games/iagno/default.nix

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 641a43b8417..38c18a6a265 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -32,7 +32,7 @@ let
     nautilus-sendto dconf-editor vinagre
   ];
 
-  gamesPackages = with gnome3; [ swell-foop lightsoff ];
+  gamesPackages = with gnome3; [ swell-foop lightsoff iagno ];
 
   inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
@@ -283,10 +283,12 @@ let
 
 #### Games
 
-  swell-foop = callPackage ./games/swell-foop { };
+  iagno = callPackage ./games/iagno { };
 
   lightsoff = callPackage ./games/lightsoff { };
 
+  swell-foop = callPackage ./games/swell-foop { };
+
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
   california = callPackage ./misc/california { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
new file mode 100644
index 00000000000..90d31eaa5cf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
+, intltool, itstool, libcanberra_gtk3, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "iagno-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/iagno/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0pg4sx277idfab3qxxn8c7r6gpdsdw5br0x7fxhxqascvvx8my1k";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+                  libxml2 libcanberra_gtk3 makeWrapper itstool intltool ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/iagno" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Iagno;
+    description = "Computer version of the game Reversi, more popularly called Othello";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From 17b924bb9f2bf6f559619e5c02397b3d494e2cf7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 12:33:27 -0700
Subject: [PATCH 026/123] linux-firmware: 2015-07-12 -> 2015-07-23

---
 .../firmware-linux-nonfree/default.nix        | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index bbe35fe9699..259c5acdf87 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,13 +1,21 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-07-12";
+  version = "2015-07-23";
 
-  src = fetchgit {
-    url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git";
-    rev = "5e6d7a9d70b562c60471e234f78137020d65ccbf";
-    sha256 = "06gvjdqpbayfv696hxn9xjkbzddj1hy6z9aahi156lvj96qb9z49";
+  # This repo is built by merging the latest versions of
+  # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
+  # and
+  # http://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/
+  # for any given date. This gives us up to date iwlwifi firmware as well as
+  # the usual set of firmware. firmware/linux-firmware usually lags kernel releases
+  # so iwlwifi cards will fail to load on newly released kernels.
+  src = fetchFromGitHub {
+    owner = "wkennington";
+    repo = "linux-firmware";
+    rev = "854b7f33e839ceea41034b45d6f755ea70c85486";
+    sha256 = "1hhqvb96adk64ljf6hp5qss8fhpic28y985gbggh5p2w9bsgs5zq";
   };
 
   preInstall = ''

From d8991a7b3be89fce647299beb144eb77b302898e Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 13:12:25 -0700
Subject: [PATCH 027/123] xf86-video-intel: 2.99.917 -> 2015-07-22

---
 pkgs/servers/x11/xorg/default.nix             |  6 +-
 pkgs/servers/x11/xorg/overrides.nix           |  2 +-
 ...tel-2.99.917-libdrm-kernel-4_0-crash.patch | 65 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 5 insertions(+), 70 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f0fdb67f30e..d270b11d5c3 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1615,11 +1615,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
-    name = "xf86-video-intel-2.99.917";
+    name = "xf86-video-intel-2015-07-22";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2;
-      sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0";
+      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/a29e765ec0c1d73ee7ef2dad3aa148214ec04335.tar.gz;
+      sha256 = "094qa8x0f7vgyirjbj9qdyak71nwxnmmsxml4zk49z59blq4l874";
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
   }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0fc70fb6e17..11a79bd6586 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -420,7 +420,7 @@ in
 
   xf86videointel = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [xorg.libXfixes];
-    patches = [ ./xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch ];
+    nativeBuildInputs = [args.autoreconfHook xorg.utilmacros];
   };
 
   xwd = attrs: attrs // {
diff --git a/pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch b/pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
deleted file mode 100644
index ea3aa30ed13..00000000000
--- a/pkgs/servers/x11/xorg/xf86-video-intel-2.99.917-libdrm-kernel-4_0-crash.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu, 19 Mar 2015 23:14:17 +0000
-Subject: sna: Protect against ABI breakage in recent versions of libdrm
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-
-diff --git a/src/sna/kgem.c b/src/sna/kgem.c
-index 11f0828..6f16cba 100644
---- a/src/sna/kgem.c
-+++ b/src/sna/kgem.c
-@@ -182,6 +182,15 @@ struct local_i915_gem_caching {
- #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching)
- #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching)
- 
-+struct local_i915_gem_mmap {
-+	uint32_t handle;
-+	uint32_t pad;
-+	uint64_t offset;
-+	uint64_t size;
-+	uint64_t addr_ptr;
-+};
-+#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap)
-+
- struct local_i915_gem_mmap2 {
- 	uint32_t handle;
- 	uint32_t pad;
-@@ -514,15 +523,15 @@ retry_wc:
- 
- static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo)
- {
--	struct drm_i915_gem_mmap mmap_arg;
-+	struct local_i915_gem_mmap arg;
- 	int err;
- 
- retry:
--	VG_CLEAR(mmap_arg);
--	mmap_arg.handle = bo->handle;
--	mmap_arg.offset = 0;
--	mmap_arg.size = bytes(bo);
--	if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) {
-+	VG_CLEAR(arg);
-+	arg.handle = bo->handle;
-+	arg.offset = 0;
-+	arg.size = bytes(bo);
-+	if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) {
- 		assert(err != EINVAL);
- 
- 		if (__kgem_throttle_retire(kgem, 0))
-@@ -536,10 +545,10 @@ retry:
- 		return NULL;
- 	}
- 
--	VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo)));
-+	VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo)));
- 
- 	DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle));
--	return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr;
-+	return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr;
- }
- 
- static int gem_write(int fd, uint32_t handle,
--- 
-cgit v0.10.2
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 094005f6e5a..8e7ca4dcd6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9266,7 +9266,7 @@ let
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libpng zlib perl mesa_drivers spice_protocol
-      dbus libuuid openssl gperf m4 libevdev tradcpp libinput makeWrapper
+      dbus libuuid openssl gperf m4 libevdev tradcpp libinput makeWrapper autoreconfHook
       autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
     bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
     mesa = mesa_noglu;

From 612d19e8b42007c489c04c71ce3efa018c98014a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 13:13:43 -0700
Subject: [PATCH 028/123] kernel: 3.18.18 -> 3.18.19

---
 pkgs/os-specific/linux/kernel/linux-3.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index b0b4c6ed5bd..527ded2db94 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.18";
+  version = "3.18.19";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1fcd4xfnywwb3grdvcnf39njwzb40v10rnzagxqmancsaqy253jv";
+    sha256 = "1jdp4mixggzjy1v806v5q7qqimkm6pbjav3gwbcl2cccv6wd701x";
   };
 
   features.iwlwifi = true;

From 24c13dfa81d59a14760ffc763d4c1a51a98f4f0a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 13:14:03 -0700
Subject: [PATCH 029/123] kernel: 4.1.2 -> 4.1.3

---
 pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 5405ae9956d..031b0d549d9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.2";
+  version = "4.1.3";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy";
+    sha256 = "02z3palvki31qimmycz4y4wl4lb46n662qql46iah224k0q2rpcn";
   };
 
   features.iwlwifi = true;

From dfc53b1bac1930acb0d823c774187999539200b9 Mon Sep 17 00:00:00 2001
From: Yochai <yochai@titat.info>
Date: Wed, 22 Jul 2015 11:53:07 +0300
Subject: [PATCH 030/123] Steam: removed flashplayer

---
 pkgs/games/steam/chrootenv.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index ff4b104059d..d1aa125169e 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -60,8 +60,6 @@ buildFHSUserEnv {
       pkgs.openal
       pkgs.libpulseaudio
 
-      pkgs.flashplayer
-
       pkgs.gst_all_1.gst-plugins-ugly # "Audiosurf 2" needs this
     ];
 

From 6d257267ae485d4ba0476f12f358ffbfdd5ca990 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 18 Jul 2015 17:00:24 +0200
Subject: [PATCH 031/123] mutt-kz: 1.5.23.1-rc1 -> 1.5.23.1

---
 pkgs/applications/networking/mailreaders/mutt-kz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
index a162df9f33b..5cd0ef9f7a4 100644
--- a/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt-kz/default.nix
@@ -16,14 +16,14 @@ assert saslSupport -> cyrus_sasl != null;
 assert gpgmeSupport -> gpgme != null;
 
 let
-  version = "1.5.23.1-rc1";
+  version = "1.5.23.1";
 in
 stdenv.mkDerivation rec {
   name = "mutt-kz-${version}";
 
   src = fetchurl {
     url = "https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz";
-    sha256 = "1m4bnn8psyrx2wy8ribannmp5qf75lv1gz116plji2z37z015zny";
+    sha256 = "01k4hrf8x2100pcqnrm61mm1x0pqi2kr3rx22k5hwvbs1wh8zyhz";
   };
 
   buildInputs = with stdenv.lib;

From 2054eea48ae1b2e229b06d0dcd903eec0f923e40 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 14:32:34 -0700
Subject: [PATCH 032/123] libva: 1.5.1 -> 1.6.0

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

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 44001496988..c9af48d1c59 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.5.1";
+  name = "libva-1.6.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495";
+    sha256 = "0n1l2mlhsvmsbs3qcphl4p6w13jnbv6s3hil8b6fj43a3afdrn9s";
   };
 
   buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ];

From b2e598c31afca21b74d203ffadd128002497446a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 14:32:42 -0700
Subject: [PATCH 033/123] vaapiIntel: 1.5.1 -> 1.6.0

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

diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index d873d801bac..61f88cea7e1 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-intel-driver-1.5.1";
+  name = "libva-intel-driver-1.6.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
-    sha256 = "1p7aw0wmb6z3rbbm3bqlp6rxw41kii23csbjmcvbbk037lq6rnqb";
+    sha256 = "1m08z9md113rv455i78k6784vkjza5k84d59bgpah08cc7jayxlq";
   };
 
   patchPhase = ''

From ac36ed18eb9583df48c244e2301d013c827f78e7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 22 Jul 2015 14:33:06 -0700
Subject: [PATCH 034/123] dhcpcd: 6.9.0 -> 6.9.1

---
 pkgs/tools/networking/dhcpcd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index a89d1e3e888..d4ec7f7f0ad 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-6.9.0";
+  name = "dhcpcd-6.9.1";
 
   src = fetchurl {
-    url = "mirror://roy/dhcpcd/${name}.tar.bz2";
-    sha256 = "0s0a29ml9x108lxv5yz55f3l5kvlx4hcbxigfq3hr245yy7aarhm";
+    url = "mirror://roy/dhcpcd/${name}.tar.xz";
+    sha256 = "0vq6gjgn2sjq2rwvd23gvf55k2v9l6970z8fmii0p2g23w77afy0";
   };
 
   buildInputs = [ pkgconfig udev ];

From 6079babed8c537759448c8276f0158e66e57299d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 23 Jul 2015 01:17:12 +0200
Subject: [PATCH 035/123] horst: init at git-2015-07-22

---
 pkgs/tools/networking/horst/default.nix | 32 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/networking/horst/default.nix

diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix
new file mode 100644
index 00000000000..0f18534d200
--- /dev/null
+++ b/pkgs/tools/networking/horst/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchFromGitHub, pkgconfig, ncurses, libnl }:
+
+stdenv.mkDerivation rec {
+  name = "horst-${version}";
+  version = "git-2015-07-22";
+
+  src = fetchFromGitHub {
+    owner = "br101";
+    repo = "horst";
+    rev = "b62fc20b98690061522a431cb278d989e21141d8";
+    sha256 = "176yma8v2bsab2ypgmgzvjg0bsbnk9sga3xpwkx33mwm6q79kd6g";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses libnl ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv horst $out/bin
+
+    mkdir -p $out/man/man1
+    cp horst.1 $out/man/man1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface";
+    homepage = http://br1.einfach.org/tech/horst/;
+    maintainers = [ maintainers.fpletz ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e7ca4dcd6e..00a9fb73385 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1836,6 +1836,8 @@ let
 
   honcho = callPackage ../tools/system/honcho { };
 
+  horst = callPackage ../tools/networking/horst { };
+
   host = callPackage ../tools/networking/host { };
 
   hping = callPackage ../tools/networking/hping { };

From c805663bf41244d2f5608ae385a2426d798909c0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 17:56:43 +0200
Subject: [PATCH 036/123] stress-ng: 0.04.10 -> 0.04.11

Changes: https://launchpad.net/ubuntu/+source/stress-ng/+changelog
---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 4093eb7879d..5336a54e190 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.10"; in
+let version = "0.04.11"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "1y0jmcgwn8np22r3ajg7giai8dvfg0r5ddpgbiqs48cx2gz7iyhf";
+    sha256 = "0hh1cqszviza4hvaj0hkhg8r42zjikcj6rc3l6fviwmr7f247ls5";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 0c00290fbb0306c2e9704dce3fe47a70627ad45f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 18:14:48 +0200
Subject: [PATCH 037/123] ipv6calc: 0.98.0 -> 0.99.0

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

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index 102d0688234..f3dadbd7243 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, geoip, geolite-legacy, getopt, openssl, perl }:
 
+let version = "0.99.0"; in
 stdenv.mkDerivation rec {
-  version = "0.98.0";
   name = "ipv6calc-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
-    sha256 = "02r0r4lgz10ivbmgdzivj7dvry1aad75ik9vyy6irjvngjkzg5r3";
+    sha256 = "1dgx6gji9dyz77jssk2ax5r0ycq4jcsks71bhvcpb79k02wkaxgw";
   };
 
   buildInputs = [ geoip geolite-legacy getopt openssl ];
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Calculate/manipulate (not only) IPv6 addresses";
     longDescription = ''
       ipv6calc is a small utility to manipulate (not only) IPv6 addresses and
@@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.deepspace6.net/projects/ipv6calc.html;
     license = licenses.gpl2;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

From 72fd2a609c52bc39119bc239ed039f744dd20dcc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 18:15:16 +0200
Subject: [PATCH 038/123] ipv6calc: make geoip and geolite-legacy "optional"

---
 pkgs/tools/networking/ipv6calc/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index f3dadbd7243..a4725e8140f 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -21,14 +21,16 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  configureFlags = ''
-    --disable-bundled-getopt
-    --disable-bundled-md5
-    --disable-dynamic-load
-    --enable-shared
-    --enable-geoip
-    --with-geoip-db=${geolite-legacy}/share/GeoIP
-  '';
+  configureFlags = [
+    "--disable-bundled-getopt"
+    "--disable-bundled-md5"
+    "--disable-dynamic-load"
+    "--enable-shared"
+  ] ++ stdenv.lib.optional (geoip != null ) [
+    "--enable-geoip"
+  ] ++ stdenv.lib.optional (geolite-legacy != null) [
+    "--with-geoip-db=${geolite-legacy}/share/GeoIP"
+  ];
 
   enableParallelBuilding = true;
 

From 3e79e3a264da7f1617259fe7675c588b0fc50487 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 19:12:14 +0200
Subject: [PATCH 039/123] remotebox: 1.9 -> 2.0

Changes:
- RemoteBox now requires VirtualBox 5.0.x
- Added guest support for USB 3.0
- Added OS icons for Windows 10, OS/2 1.x, Yosemite, El Capitan
- Added command line options for automatic login. See manual
- Added option to set the virtual VGA card of a guest to either
  VirtualBox VGA or VMware SVGA-II
- Allow snapshots to be taken while the guest is paused
- Added support for adding USB storage controller to a guest
- Added support for adding transient shared folders
- Added support for setting IPv6 Port Forwarding rules on NAT networks
- Added option to convert disk images to VDI when importing an
  appliance
- Changed the way guest details are displayed and added an option
  to show extended (slower) or reduced (faster) guest details
- Added support for selecting built-in presets for the RDP clients.
  These are currently FreeRDP (New Syntax), FreeRDP (Old Syntax),
  Rdesktop, Windows Remote Desktop Client
- Added support for selecting the paravirtualization interface for
  a guest
- Added keyboard toolbutton for quick access to common keyboard
  sequences. The full keyboard menu is still available
- Fixed a problem with trailing slashes in a URL preventing the
  remote display to a guest from opening.
- Fixed a problem with UTF8 strings affecting the listing of storage
  attached to controllers
- Fixed an issue where stuck guests couldn't be stopped from the GUI
- Various GUI tweaks
---
 .../virtualization/remotebox/default.nix      | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index 14adddf8d1b..e07f8d5b92c 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -1,40 +1,44 @@
-{ stdenv, fetchurl, perl, perlPackages }:
+{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
-stdenv.mkDerivation rec {
-  version = "1.9";
+let version = "2.0"; in
+stdenv.mkDerivation {
   name = "remotebox-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/RemoteBox-${version}.tar.bz2";
-    sha256 = "0vsfz2qmha9nz60fyksgqqyrw4lz9z2d5isnwqc6afn8z3i1qmkp";
+    url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
+    sha256 = "0c73i53wdjd2m2sdgq3r3xp30irxh5z5rak2rk79yb686s6bv759";
   };
 
-  buildInputs = [ perl perlPackages.Gtk2 perlPackages.SOAPLite ];
+  buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp -a docs/ share/ $out
+    mkdir -pv $out/bin
 
     substituteInPlace remotebox --replace "\$Bin/" "\$Bin/../"
-    install -t $out/bin remotebox
+    install -v -t $out/bin remotebox
+    wrapProgram $out/bin/remotebox --prefix PERL5LIB : $PERL5LIB
 
-    mkdir -p $out/share/applications
-    cp -p packagers-readme/*.desktop $out/share/applications
+    cp -av docs/ share/ $out
+
+    mkdir -pv $out/share/applications
+    cp -pv packagers-readme/*.desktop $out/share/applications
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "VirtualBox client with remote management";
     homepage = http://remotebox.knobgoblin.org.uk/;
     license = licenses.gpl2Plus;
     longDescription = ''
       VirtualBox is traditionally considered to be a virtualization solution
-      aimed at the desktop.  While it is certainly possible to install
+      aimed at the desktop. While it is certainly possible to install
       VirtualBox on a server, it offers few remote management features beyond
       using the vboxmanage command line.
       RemoteBox aims to fill this gap by providing a graphical VirtualBox
       client which is able to manage a VirtualBox server installation.
     '';
     maintainers = with maintainers; [ nckx ];
-    platforms = with platforms; all;
+    platforms = platforms.all;
   };
 }

From 72f6a797fa1bb97a8af6a03c6a31a911f5e27bcb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 20:21:32 +0200
Subject: [PATCH 040/123] hplip: fix (Python) tools again

Something changed in the generic fixupPhase magic exposing a bug
in the previous fix (wrapPythonPrograms where I should have used
wrapPythonProgramsIn).

Also move buildInputs and friends to a more conventional spot.
---
 pkgs/misc/drivers/hplip/default.nix | 79 +++++++++++++++--------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index ba64b729393..c069f6bbb9f 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -39,6 +39,28 @@ in
 stdenv.mkDerivation {
   inherit name src;
 
+  buildInputs = [
+    libjpeg
+    cups
+    libusb1
+    pythonPackages.python
+    pythonPackages.wrapPython
+    saneBackends
+    dbus
+    net_snmp
+  ] ++ stdenv.lib.optional qtSupport qt4;
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  pythonPath = with pythonPackages; [
+    dbus
+    pillow
+    pygobject
+    recursivePthLoader
+    reportlab
+  ] ++ stdenv.lib.optional qtSupport pyqt4;
+
   prePatch = ''
     # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
     find . -type f -exec sed -i \
@@ -73,24 +95,7 @@ stdenv.mkDerivation {
   '';
 
   postInstall =
-    ''
-      # Wrap the user-facing Python scripts in /bin without turning the ones
-      # in /share into shell scripts (they need to be importable).
-      # Complicated by the fact that /bin contains just symlinks to /share.
-      for bin in $out/bin/*; do
-        py=`readlink -m $bin`
-        rm $bin
-        cp $py $bin
-        wrapPythonProgramsIn $bin "$out $pythonPath"
-        sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin
-      done
-
-      # Remove originals. Knows a little too much about wrapPythonProgramsIn.
-      rm -f $out/bin/.*-wrapped
-
-      wrapPythonPrograms $out/lib "$out $pythonPath"
-    ''
-    + (stdenv.lib.optionalString withPlugin
+    (stdenv.lib.optionalString withPlugin
     (let hplip_arch =
           if stdenv.system == "i686-linux" then "x86_32"
           else if stdenv.system == "x86_64-linux" then "x86_64"
@@ -129,29 +134,25 @@ stdenv.mkDerivation {
     mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf
 
     rm $out/etc/udev/rules.d/56-hpmud.rules
-    ''));
+  ''));
 
-  buildInputs = [
-      libjpeg
-      cups
-      libusb1
-      pythonPackages.python
-      pythonPackages.wrapPython
-      saneBackends
-      dbus
-      net_snmp
-    ] ++ stdenv.lib.optional qtSupport qt4;
-  nativeBuildInputs = [
-    pkgconfig
-  ];
+  fixupPhase = ''
+    # Wrap the user-facing Python scripts in /bin without turning the ones
+    # in /share into shell scripts (they need to be importable).
+    # Complicated by the fact that /bin contains just symlinks to /share.
+    for bin in $out/bin/*; do
+      py=`readlink -m $bin`
+      rm $bin
+      cp $py $bin
+      wrapPythonProgramsIn $bin "$out $pythonPath"
+      sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin
+    done
 
-  pythonPath = with pythonPackages; [
-      dbus
-      pillow
-      pygobject
-      recursivePthLoader
-      reportlab
-    ] ++ stdenv.lib.optional qtSupport pyqt4;
+    # Remove originals. Knows a little too much about wrapPythonProgramsIn.
+    rm -f $out/bin/.*-wrapped
+
+    wrapPythonProgramsIn $out/lib "$out $pythonPath"
+  '';
 
   meta = with stdenv.lib; {
     description = "Print, scan and fax HP drivers for Linux";

From 1bad2fa6115da55d6054e389744803758f9fe202 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 20:54:57 +0200
Subject: [PATCH 041/123] hplip: fix scanning for USB devices

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

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index c069f6bbb9f..b77ec099819 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, automake, pkgconfig
-, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
+, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils
 , polkit, qtSupport ? true, qt4, pyqt4, net_snmp
 , withPlugin ? false, substituteAll, makeWrapper
 }:
@@ -59,6 +59,7 @@ stdenv.mkDerivation {
     pygobject
     recursivePthLoader
     reportlab
+    usbutils
   ] ++ stdenv.lib.optional qtSupport pyqt4;
 
   prePatch = ''

From 603b146979af8fdd696b11ea0ff81c36700751c5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 20:58:08 +0200
Subject: [PATCH 042/123] hplip: 3.15.6 -> 3.15.7

---
 pkgs/misc/drivers/hplip/default.nix | 60 +++++++++++++++--------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index b77ec099819..a96e71a3af0 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -6,19 +6,25 @@
 
 let
 
-  name = "hplip-3.15.6";
+  version = "3.15.7";
+
+  name = "hplip-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "1jbnjw7vrn1qawrjfdv8j58w69q8ki1qkzvlh0nk8nxacpp17i9h";
+    sha256 = "17flpl89lgwlbsy9mka910g530nnvlwqqnif8a9hyq7k90q9046k";
+  };
+
+  plugin = fetchurl {
+    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
+    sha256 = "0fblh5m43jnws4vkwks0b4m9k3jg9kspaj1l8bic0r5swy97s41m";
   };
 
   hplip_state =
     substituteAll
       {
+        inherit version;
         src = ./hplip.state;
-        # evaluated this way, version is always up-to-date
-        version = (builtins.parseDrvName name).version;
       };
 
   hplip_arch =
@@ -29,11 +35,6 @@ let
       "arm7l-linux" = "arm32";
     }."${stdenv.system}" or (abort "Unsupported platform ${stdenv.system}");
 
-  plugin = fetchurl {
-    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "1rymxahz12s1s37rri5qyvka6q0yi0yai08kgspg24176ry3a3fx";
-  };
-
 in
 
 stdenv.mkDerivation {
@@ -74,33 +75,33 @@ stdenv.mkDerivation {
       {} +
   '';
 
-  preConfigure = ''
-    export configureFlags="$configureFlags
-      --with-cupsfilterdir=$out/lib/cups/filter
-      --with-cupsbackenddir=$out/lib/cups/backend
-      --with-icondir=$out/share/applications
-      --with-systraydir=$out/xdg/autostart
-      --with-mimedir=$out/etc/cups
-      --enable-policykit
-    "
-
-    export makeFlags="
-      halpredir=$out/share/hal/fdi/preprobe/10osvendor
-      rulesdir=$out/etc/udev/rules.d
-      policykit_dir=$out/share/polkit-1/actions
-      policykit_dbus_etcdir=$out/etc/dbus-1/system.d
-      policykit_dbus_sharedir=$out/share/dbus-1/system-services
-      hplip_confdir=$out/etc/hp
-      hplip_statedir=$out/var/lib/hp
-    ";
+  configureFlags = ''
+    --with-cupsfilterdir=$(out)/lib/cups/filter
+    --with-cupsbackenddir=$(out)/lib/cups/backend
+    --with-icondir=$(out)/share/applications
+    --with-systraydir=$(out)/xdg/autostart
+    --with-mimedir=$(out)/etc/cups
+    --enable-policykit
   '';
 
+  makeFlags = ''
+    halpredir=$(out)/share/hal/fdi/preprobe/10osvendor
+    rulesdir=$(out)/etc/udev/rules.d
+    policykit_dir=$(out)/share/polkit-1/actions
+    policykit_dbus_etcdir=$(out)/etc/dbus-1/system.d
+    policykit_dbus_sharedir=$(out)/share/dbus-1/system-services
+    hplip_confdir=$(out)/etc/hp
+    hplip_statedir=$(out)/var/lib/hp
+  '';
+
+  enableParallelBuilding = true;
+
   postInstall =
     (stdenv.lib.optionalString withPlugin
     (let hplip_arch =
           if stdenv.system == "i686-linux" then "x86_32"
           else if stdenv.system == "x86_64-linux" then "x86_64"
-          else abort "Platform must be i686-linux or x86_64-linux!";
+          else abort "Plugin platform must be i686-linux or x86_64-linux!";
     in
     ''
     sh ${plugin} --noexec --keep
@@ -156,6 +157,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Print, scan and fax HP drivers for Linux";
     homepage = http://hplipopensource.com/;
     license = if withPlugin

From aebb3ec0f4edcd5f7f51b6c794e7a20da3f9bd3b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 22 Jul 2015 23:17:08 +0200
Subject: [PATCH 043/123] hplip: patch shebangs in $out/share

A full wrap isn't needed as these scripts are only run from within
hplip's own environment, and unwanted because they are imported
as Python modules.

Also fix a reference to /etc in $out/etc/hp/hplip.conf, though I've no
idea whether it is actually used.
---
 pkgs/misc/drivers/hplip/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index a96e71a3af0..d173b0ac406 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -139,9 +139,9 @@ stdenv.mkDerivation {
   ''));
 
   fixupPhase = ''
-    # Wrap the user-facing Python scripts in /bin without turning the ones
-    # in /share into shell scripts (they need to be importable).
-    # Complicated by the fact that /bin contains just symlinks to /share.
+    # Wrap the user-facing Python scripts in $out/bin without turning the
+    # ones in $out /share into shell scripts (they need to be importable).
+    # Note that $out/bin contains only symlinks to $out/share.
     for bin in $out/bin/*; do
       py=`readlink -m $bin`
       rm $bin
@@ -153,7 +153,18 @@ stdenv.mkDerivation {
     # Remove originals. Knows a little too much about wrapPythonProgramsIn.
     rm -f $out/bin/.*-wrapped
 
+    # Merely patching shebangs in $out/share does not cause trouble.
+    for i in $out/share/hplip{,/*}/*.py; do
+      substituteInPlace $i \
+        --replace /usr/bin/python \
+        ${pythonPackages.python}/bin/${pythonPackages.python.executable} \
+        --replace "/usr/bin/env python" \
+        ${pythonPackages.python}/bin/${pythonPackages.python.executable}
+    done
+
     wrapPythonProgramsIn $out/lib "$out $pythonPath"
+
+    substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
   '';
 
   meta = with stdenv.lib; {

From ec15244f1ae6a3040077f65f49b360dca58815ce Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 23 Jul 2015 00:05:56 +0200
Subject: [PATCH 044/123] apitrace: 6.1 -> 7.0

- Many bug fixes
- Switch to Qt 5
---
 pkgs/applications/graphics/apitrace/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index 8e546652f85..cd107a6d279 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, python, libX11, qt4 }:
+{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, qt5 }:
 
-let version = "6.1"; in
+let version = "7.0"; in
 stdenv.mkDerivation {
   name = "apitrace-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1v38111ljd35v5sahshs3inhk6nsv7rxh4r0ck8k0njkwzlx2yqk";
+    sha256 = "0nn3z7i6cd4zkmms6jpp1v2q194gclbs06v0f5hyiwcsqaxzsg5b";
     rev = version;
     repo = "apitrace";
     owner = "apitrace";
   };
 
-  buildInputs = [ python libX11 qt4 ];
+  buildInputs = [ libX11 procps python qt5.base ];
   nativeBuildInputs = [ cmake ];
 
   buildPhase = ''
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     homepage = https://apitrace.github.io;
     description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
     license = licenses.mit;

From 1266e5880ef7100ec0cc9a008521fabdc15767b0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 23 Jul 2015 00:47:46 +0200
Subject: [PATCH 045/123] perl-packages: Glib 1.310 -> 1.312

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index de2ad38a33e..5b5c2c097b9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4128,10 +4128,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Glib = buildPerlPackage rec {
-    name = "Glib-1.310";
+    name = "Glib-1.312";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
-      sha256 = "1iv8q7d0817m3byh2yn7bxxk5qp8bgapaflbglhkw467i31slign";
+      sha256 = "1aqww3ncaxiclfiqvl81hx7k3w4pri3k52rrar0hpzcasics5zr3";
     };
     buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ];
     meta = {

From dfeaaa89098bc89f79d1686faf05b1a55d36fa54 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 23 Jul 2015 04:05:00 +0200
Subject: [PATCH 046/123] geolite-legacy: use correct local naming scheme

Following http://dev.maxmind.com/geoip/legacy/install/city/:

  "Then rename the *.dat file to GeoIP.dat, GeoIPRegion.dat, or
   GeoIPCity.dat, for the GeoIP Country, Region or City databases,
   respectively."

Using the default "GeoLiteCity*.dat" name caused ipv6calc to miss it
(verified using `ipv6calc -vv`).
---
 pkgs/data/misc/geolite-legacy/default.nix     | 24 ++++++++++++-------
 pkgs/tools/networking/netsniff-ng/default.nix |  4 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index ae7b344ff0e..138a9c40c79 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
 
 let
-  fetchDB = name: sha256: fetchurl {
-    inherit sha256;
-    url = "https://geolite.maxmind.com/download/geoip/database/${name}";
+  fetchDB = src: name: sha256: fetchurl {
+    inherit name sha256;
+    url = "https://geolite.maxmind.com/download/geoip/database/${src}";
   };
 
   # Annoyingly, these files are updated without a change in URL. This means that
@@ -13,17 +13,23 @@ in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
-  srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz"
+  srcGeoIP = fetchDB
+    "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
     "0c6jcmlgkybsqiwqwa21igjazf95dj38mn516cqqqfdg7ciaj1d5";
-  srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz"
+  srcGeoIPv6 = fetchDB
+    "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
     "1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3";
-  srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz"
+  srcGeoLiteCity = fetchDB
+    "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
     "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";
-  srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
+  srcGeoLiteCityv6 = fetchDB
+    "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
     "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9";
-  srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz"
+  srcGeoIPASNum = fetchDB
+    "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "18kxswr0b5klimfpj1zhxipvyvrljvcywic4jc1ggcr44lf4hj9w";
-  srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz"
+  srcGeoIPASNumv6 = fetchDB
+    "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
     "0asnmmirridiy57zm0kccb7g8h7ndliswfv3yfk7zm7dk98njnxs";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 51d25ac16a4..9df8045a2e9 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
   postInstall = ''
     ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat		$out/etc/netsniff-ng/country4.dat
     ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat		$out/etc/netsniff-ng/country6.dat
-    ln -sv ${geolite-legacy}/share/GeoIP/GeoLiteCity.dat	$out/etc/netsniff-ng/city4.dat
-    ln -sv ${geolite-legacy}/share/GeoIP/GeoLiteCityv6.dat	$out/etc/netsniff-ng/city6.dat
+    ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCity.dat		$out/etc/netsniff-ng/city4.dat
+    ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCityv6.dat	$out/etc/netsniff-ng/city6.dat
     ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNum.dat		$out/etc/netsniff-ng/asname4.dat
     ln -sv ${geolite-legacy}/share/GeoIP/GeoIPASNumv6.dat	$out/etc/netsniff-ng/asname6.dat
     rm -v $out/etc/netsniff-ng/geoip.conf # updating databases after installation is impossible

From 4859513ba4effe093bc00dafbed54fa898c61151 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Wed, 15 Jul 2015 14:17:16 +0200
Subject: [PATCH 047/123] qgis: 2.8.2 -> 2.10.0

---
 pkgs/applications/gis/qgis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 08e804b7ae9..343f0343e19 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -2,7 +2,7 @@
   pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.8.2";
+  name = "qgis-2.10.0";
 
   buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
     fcgi libspatialindex libspatialite postgresql ] ++
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "fd3c01e48224f611c3bb279b0af9cc1dff3844cdc93f7b45e4f37cf8f350bc4b";
+    sha256 = "07f9b73bc95e8ec5c69249842c2680634deb57515389268b42dccc6b2f6fd0d7";
   };
 
   postInstall = ''

From a9dc7166315357fcdcbcdfd77646ef32d4edb7ca Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Thu, 23 Jul 2015 08:03:00 +0200
Subject: [PATCH 048/123] qgis: 2.10.0 -> 2.10.1

---
 pkgs/applications/gis/qgis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 343f0343e19..bda364cb26f 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -2,7 +2,7 @@
   pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.10.0";
+  name = "qgis-2.10.1";
 
   buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
     fcgi libspatialindex libspatialite postgresql ] ++
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "07f9b73bc95e8ec5c69249842c2680634deb57515389268b42dccc6b2f6fd0d7";
+    sha256 = "79119b54642edaffe3cda513531eb7b81913e013954a49c6d3b21c8b00143307";
   };
 
   postInstall = ''

From 5955f815efb1eb5111be2346287ef81d79d220f8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 22 Jul 2015 23:07:31 +0200
Subject: [PATCH 049/123] dfu-util: init at 0.8

Since the website and Sourceforge are currently down, the source tarball
is fetched from Debian mirrors.
---
 .../tools/misc/dfu-util/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/misc/dfu-util/default.nix

diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix
new file mode 100644
index 00000000000..f3a986e6432
--- /dev/null
+++ b/pkgs/development/tools/misc/dfu-util/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, libusb1 }:
+
+stdenv.mkDerivation rec {
+  name="dfu-util-${version}";
+  version = "0.8";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libusb1 ];
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/d/dfu-util/dfu-util_0.8.orig.tar.gz";
+    sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Device firmware update (DFU) USB programmer";
+    longDescription = ''
+      dfu-util is a program that implements the host (PC) side of the USB
+      DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol.
+
+      DFU is intended to download and upload firmware to devices connected over
+      USB. It ranges from small devices like micro-controller boards up to mobile
+      phones. With dfu-util you are able to download firmware to your device or
+      upload firmware from it.
+    '';
+    homepage = http://dfu-util.gnumonks.org/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00a9fb73385..261158a6e0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5423,6 +5423,8 @@ let
 
   dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };
 
+  dfu-util = callPackage ../development/tools/misc/dfu-util { };
+
   ddd = callPackage ../development/tools/misc/ddd { };
 
   distcc = callPackage ../development/tools/misc/distcc { };

From d2f923341aef2317774ff55b23c46dffada86a24 Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Wed, 22 Jul 2015 12:55:23 -0500
Subject: [PATCH 050/123] g-wrap: 1.9.13 -> 1.9.15

---
 pkgs/development/tools/guile/g-wrap/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index e62ce13ebf7..ed492a0b82d 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -1,11 +1,10 @@
-{ fetchurl, stdenv, guile, libffi, pkgconfig, glib
-, guile_lib }:
+{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile_lib }:
 
 stdenv.mkDerivation rec {
-  name = "g-wrap-1.9.13";
+  name = "g-wrap-1.9.15";
   src = fetchurl {
     url = "mirror://savannah/g-wrap/${name}.tar.gz";
-    sha256 = "0fc874zlwzjahyliqnva1zfsv0chlx4cvfhwchij9n2d3kmsss9v";
+    sha256 = "140fcvp24pqmfmiibhjxl3s75hj26ln7pkl2wxas84lnchbj9m4d";
   };
 
   # Note: Glib support is optional, but it's quite useful (e.g., it's
@@ -26,6 +25,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.nongnu.org/g-wrap/;
     license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.taktoa ];
   };
 }

From 45e3892386e5bf93872e69781b7b065c6749403b Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Wed, 22 Jul 2015 12:56:03 -0500
Subject: [PATCH 051/123] guile-gnome-platform: 2.16.1 -> 2015/01/23 git

---
 .../guile-modules/guile-gnome/default.nix     | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index e2392773de7..24928fc067f 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,21 +1,39 @@
-{ fetchurl, stdenv, guile, guile_lib, gwrap
+{ fetchgit, stdenv, guile, guile_lib, gwrap
 , pkgconfig, gconf, glib, gnome_vfs, gtk
-, libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }:
+, libglade, libgnome, libgnomecanvas, libgnomeui
+, pango, guileCairo, autoconf, automake, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "guile-gnome-platform-2.16.1";
+  name = "guile-gnome-platform-20150123";
 
-  src = fetchurl {
-    url = "mirror://gnu/guile-gnome/guile-gnome-platform/${name}.tar.gz";
-    sha256 = "0yy5f4c78jlakxi2bwgh3knc2szw26hg68xikyaza2iim39mc22c";
+  src = fetchgit {
+    url = "git://git.sv.gnu.org/guile-gnome.git";
+    rev = "0fcbe69797b9501b8f1283a78eb92bf43b08d080";
+    sha256 = "1vqlzb356ggmp8jh833gksg59c53vbmmhycbcf52qj0fdz09mpb5";
   };
 
-  buildInputs =
-    [ guile gwrap
-      pkgconfig gconf glib gnome_vfs gtk libglade libgnome libgnomecanvas
-      libgnomeui pango guileCairo
-    ]
-    ++ stdenv.lib.optional doCheck guile_lib;
+  buildInputs = [
+    autoconf
+    automake
+    texinfo
+    guile
+    gwrap
+    pkgconfig
+    gconf
+    glib
+    gnome_vfs
+    gtk
+    libglade
+    libgnome
+    libgnomecanvas
+    libgnomeui
+    pango
+    guileCairo
+  ] ++ stdenv.lib.optional doCheck guile_lib;
+
+  preConfigure = ''
+      ./autogen.sh
+  '';
 
   # The test suite tries to open an X display, which fails.
   doCheck = false;
@@ -35,6 +53,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.taktoa ];
   };
 }

From af2ab0b911a153813789107b19f8066ee4414944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Jul 2015 16:25:00 +0200
Subject: [PATCH 052/123] remove gcc49 overrides from various places

An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.

(cherry picked from commit 3064b6a0cc4dc047fae97bdffa0725bc7fd38f2e)
---
 pkgs/development/libraries/bobcat/default.nix      | 4 ++--
 pkgs/development/tools/parsing/flexc++/default.nix | 4 ++--
 pkgs/os-specific/linux/jfbview/default.nix         | 5 ++---
 pkgs/top-level/all-packages.nix                    | 9 ++-------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 38dfce7583a..2a9ee1c9c5b 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc49, icmake, libmilter, libX11, openssl, readline
+{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
 let version = "3.25.02"; in
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ gcc49 libmilter libX11 openssl readline utillinux ];
+  buildInputs = [ libmilter libX11 openssl readline utillinux ];
   nativeBuildInputs = [ icmake yodl ];
 
   postPatch = ''
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 515fb9d251f..d723cc0382b 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bobcat, gcc49, icmake, yodl }:
+{ stdenv, fetchurl, bobcat, icmake, yodl }:
 
 let version = "2.02.00"; in
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ bobcat gcc49 ];
+  buildInputs = [ bobcat ];
   nativeBuildInputs = [ icmake yodl ];
 
   postPatch = ''
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 4b371097ee6..34bf136ece7 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -1,5 +1,4 @@
-# FIXME: remove gcc49 when the default gcc supports C++1y
-{ stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11
+{ stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11
 , mujs, mupdf, ncurses, openjpeg, openssl }:
 
 let
@@ -16,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "jichu4n";
   };
 
-  buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf
+  buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf
     ncurses openjpeg openssl ];
 
   buildFlags = binaries;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 261158a6e0e..d4711d8e67b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3134,9 +3134,7 @@ let
 
   torbutton = callPackage ../tools/security/torbutton { };
 
-  torbrowser = callPackage ../tools/security/tor/torbrowser.nix {
-    stdenv = overrideCC stdenv gcc49;
-  };
+  torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
 
   touchegg = callPackage ../tools/inputmethods/touchegg { };
 
@@ -10841,7 +10839,6 @@ let
   clipit = callPackage ../applications/misc/clipit { };
 
   bomi = callPackage ../applications/video/bomi {
-    stdenv = overrideCC stdenv gcc49;
     pulseSupport = config.pulseaudio or true;
   };
 
@@ -13402,8 +13399,7 @@ let
   zathuraCollection = recurseIntoAttrs
     (let callPackage = newScope pkgs.zathuraCollection; in
       import ../applications/misc/zathura {
-        inherit callPackage pkgs fetchurl lib;
-        stdenv = overrideCC stdenv gcc49;
+        inherit stdenv callPackage pkgs fetchurl lib;
         useMupdf = config.zathura.useMupdf or false;
       });
 
@@ -13417,7 +13413,6 @@ let
 
   girara = callPackage ../applications/misc/girara {
     gtk = gtk3;
-    stdenv = overrideCC stdenv gcc49;
   };
 
   girara-light = callPackage ../applications/misc/girara {

From 2b2e7c27307e8b78d1b211ff0fdba86d558b37eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 21 Jul 2015 23:34:52 +0200
Subject: [PATCH 053/123] ppl: 1.0 -> 1.1, add patch to fix current ptrdiff_t
 build error

I'm updating to 1.1 because that's the version that the patch from
Fedora, which fixes ptrdiff_t build error, applies to.

Removing old patch that doesn't apply anymore. (The patch seems to be
fixing a build error that no longer exist, see
https://bugs.gentoo.org/show_bug.cgi?id=447928.)
---
 pkgs/development/libraries/ppl/default.nix    |   6 +-
 .../libraries/ppl/ppl-cstddef.patch           | 238 ++++++++++++++++++
 .../libraries/ppl/upstream-based.patch        |  42 ----
 3 files changed, 241 insertions(+), 45 deletions(-)
 create mode 100644 pkgs/development/libraries/ppl/ppl-cstddef.patch
 delete mode 100644 pkgs/development/libraries/ppl/upstream-based.patch

diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index 9edef767481..96388c3a35a 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -1,13 +1,13 @@
 { fetchurl, stdenv, gmpxx, perl, gnum4 }:
 
-let version = "1.0"; in
+let version = "1.1"; in
 
 stdenv.mkDerivation rec {
   name = "ppl-${version}";
 
   src = fetchurl {
     url = "http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.bz2";
-    sha256 = "0m0b6dzablci8mlavpsmn5w1v3r46li0wpjwvsybgxx0p1ifjsf1";
+    sha256 = "1vrqhbpyca6sf984cfcwlp8wdnfzj1g7ph9958qdky9978i1nlny";
   };
 
   nativeBuildInputs = [ perl gnum4 ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips"
     ];
 
-  patches = [ ./upstream-based.patch ];
+  patches = [ ./ppl-cstddef.patch /* from Fedora */ ];
 
   # Beware!  It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
   # x86_64 box.  Nevertheless, being a dependency of GCC, it probably ought
diff --git a/pkgs/development/libraries/ppl/ppl-cstddef.patch b/pkgs/development/libraries/ppl/ppl-cstddef.patch
new file mode 100644
index 00000000000..8c43b26bef7
--- /dev/null
+++ b/pkgs/development/libraries/ppl/ppl-cstddef.patch
@@ -0,0 +1,238 @@
+diff -up ppl-1.1/src/Dense_Row_defs.hh.orig ppl-1.1/src/Dense_Row_defs.hh
+--- ppl-1.1/src/Dense_Row_defs.hh.orig	2014-04-29 13:08:10.516682937 -0300
++++ ppl-1.1/src/Dense_Row_defs.hh	2014-04-29 13:08:50.447684466 -0300
+@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include <memory>
+ #include <vector>
+ #include <limits>
++#include <cstddef>
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+ //! A finite sequence of coefficients.
+@@ -433,7 +434,7 @@ public:
+ 
+   typedef std::bidirectional_iterator_tag iterator_category;
+   typedef Coefficient value_type;
+-  typedef ptrdiff_t difference_type;
++  typedef std::ptrdiff_t difference_type;
+   typedef value_type* pointer;
+   typedef value_type& reference;
+ 
+@@ -474,7 +475,7 @@ class Parma_Polyhedra_Library::Dense_Row
+ public:
+ 
+   typedef const Coefficient value_type;
+-  typedef ptrdiff_t difference_type;
++  typedef std::ptrdiff_t difference_type;
+   typedef value_type* pointer;
+   typedef Coefficient_traits::const_reference reference;
+ 
+diff -up ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig ppl-1.1/src/Linear_Expression_Interface_defs.hh
+--- ppl-1.1/src/Linear_Expression_Interface_defs.hh.orig	2014-04-29 13:08:17.337683198 -0300
++++ ppl-1.1/src/Linear_Expression_Interface_defs.hh	2014-04-29 13:08:40.999684104 -0300
+@@ -32,6 +32,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Sparse_Row_types.hh"
+ #include <vector>
+ #include <set>
++#include <cstddef>
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+ //! A linear expression.
+@@ -65,7 +66,7 @@ public:
+   public:
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef const Coefficient value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef Coefficient_traits::const_reference reference;
+ 
+diff -up ppl-1.1/src/CO_Tree_defs.hh.orig ppl-1.1/src/CO_Tree_defs.hh
+--- ppl-1.1/src/CO_Tree_defs.hh.orig	2014-04-29 13:11:33.725690719 -0300
++++ ppl-1.1/src/CO_Tree_defs.hh	2014-04-29 13:11:55.943691569 -0300
+@@ -28,6 +28,7 @@ site: http://bugseng.com/products/ppl/ .
+ 
+ #include "Coefficient_defs.hh"
+ #include <memory>
++#include <cstddef>
+ 
+ #ifndef PPL_CO_TREE_EXTRA_DEBUG
+ #ifdef PPL_ABI_BREAKING_EXTRA_DEBUG
+@@ -159,7 +160,7 @@ public:
+ 
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef const data_type value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef data_type_const_reference reference;
+ 
+@@ -314,7 +315,7 @@ public:
+ 
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef data_type value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef value_type& reference;
+ 
+diff -up ppl-1.1/src/CO_Tree_inlines.hh.orig ppl-1.1/src/CO_Tree_inlines.hh
+--- ppl-1.1/src/CO_Tree_inlines.hh.orig	2014-04-29 13:14:12.738696808 -0300
++++ ppl-1.1/src/CO_Tree_inlines.hh	2014-04-29 13:14:48.887698192 -0300
+@@ -24,6 +24,8 @@ site: http://bugseng.com/products/ppl/ .
+ #ifndef PPL_CO_Tree_inlines_hh
+ #define PPL_CO_Tree_inlines_hh 1
+ 
++#include <cstddef>
++
+ namespace Parma_Polyhedra_Library {
+ 
+ inline dimension_type
+@@ -31,7 +33,7 @@ CO_Tree::dfs_index(const_iterator itr) c
+   PPL_ASSERT(itr.current_index != 0);
+   PPL_ASSERT(itr.current_index >= indexes + 1);
+   PPL_ASSERT(itr.current_index <= indexes + reserved_size);
+-  const ptrdiff_t index = itr.current_index - indexes;
++  const std::ptrdiff_t index = itr.current_index - indexes;
+   return static_cast<dimension_type>(index);
+ }
+ 
+@@ -40,7 +42,7 @@ CO_Tree::dfs_index(iterator itr) const {
+   PPL_ASSERT(itr.current_index != 0);
+   PPL_ASSERT(itr.current_index >= indexes + 1);
+   PPL_ASSERT(itr.current_index <= indexes + reserved_size);
+-  const ptrdiff_t index = itr.current_index - indexes;
++  const std::ptrdiff_t index = itr.current_index - indexes;
+   return static_cast<dimension_type>(index);
+ }
+ 
+@@ -772,7 +774,7 @@ CO_Tree::tree_iterator::follow_left_chil
+   p -= (offset - 1);
+   while (*p == unused_index)
+     ++p;
+-  const ptrdiff_t distance = p - tree.indexes;
++  const std::ptrdiff_t distance = p - tree.indexes;
+   PPL_ASSERT(distance >= 0);
+   i = static_cast<dimension_type>(distance);
+   offset = least_significant_one_mask(i);
+@@ -787,7 +789,7 @@ CO_Tree::tree_iterator::follow_right_chi
+   p += (offset - 1);
+   while (*p == unused_index)
+     --p;
+-  const ptrdiff_t distance = p - tree.indexes;
++  const std::ptrdiff_t distance = p - tree.indexes;
+   PPL_ASSERT(distance >= 0);
+   i = static_cast<dimension_type>(distance);
+   offset = least_significant_one_mask(i);
+diff -up ppl-1.1/src/Linear_Expression_defs.hh.orig ppl-1.1/src/Linear_Expression_defs.hh
+--- ppl-1.1/src/Linear_Expression_defs.hh.orig	2014-04-29 13:15:39.793700141 -0300
++++ ppl-1.1/src/Linear_Expression_defs.hh	2014-04-29 13:16:07.464701201 -0300
+@@ -51,6 +51,7 @@ site: http://bugseng.com/products/ppl/ .
+ 
+ #include "Linear_Expression_Interface_defs.hh"
+ #include "Variable_defs.hh"
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -381,7 +382,7 @@ public:
+   public:
+     typedef std::bidirectional_iterator_tag iterator_category;
+     typedef const Coefficient value_type;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+     typedef value_type* pointer;
+     typedef Coefficient_traits::const_reference reference;
+ 
+diff -up ppl-1.1/src/CO_Tree.cc.orig ppl-1.1/src/CO_Tree.cc
+--- ppl-1.1/src/CO_Tree.cc.orig	2014-04-29 13:19:37.192709232 -0300
++++ ppl-1.1/src/CO_Tree.cc	2014-04-29 13:19:58.000710029 -0300
+@@ -954,7 +954,7 @@ PPL::CO_Tree
+     --subtree_size;
+   }
+ 
+-  const ptrdiff_t distance = first_unused_index - indexes;
++  const std::ptrdiff_t distance = first_unused_index - indexes;
+   PPL_ASSERT(distance >= 0);
+   return static_cast<dimension_type>(distance);
+ }
+diff -up ppl-1.1/src/Constraint_System_defs.hh.orig ppl-1.1/src/Constraint_System_defs.hh
+--- ppl-1.1/src/Constraint_System_defs.hh.orig	2014-04-29 13:30:05.530733294 -0300
++++ ppl-1.1/src/Constraint_System_defs.hh	2014-04-29 13:30:27.167734122 -0300
+@@ -37,6 +37,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "termination_types.hh"
+ #include <iterator>
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -609,7 +610,7 @@ for (Constraint_System::const_iterator i
+ class Parma_Polyhedra_Library::Constraint_System_const_iterator
+   : public std::iterator<std::forward_iterator_tag,
+                          Constraint,
+-                         ptrdiff_t,
++                         std::ptrdiff_t,
+                          const Constraint*,
+                          const Constraint&> {
+ public:
+diff -up ppl-1.1/src/Congruence_System_defs.hh.orig ppl-1.1/src/Congruence_System_defs.hh
+--- ppl-1.1/src/Congruence_System_defs.hh.orig	2014-04-29 13:33:56.927742155 -0300
++++ ppl-1.1/src/Congruence_System_defs.hh	2014-04-29 13:34:15.535742867 -0300
+@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Congruence_defs.hh"
+ #include "Constraint_System_types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -249,7 +250,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+                            Congruence,
+-                           ptrdiff_t,
++                           std::ptrdiff_t,
+                            const Congruence*,
+                            const Congruence&> {
+   public:
+diff -up ppl-1.1/src/Generator_System_defs.hh.orig ppl-1.1/src/Generator_System_defs.hh
+--- ppl-1.1/src/Generator_System_defs.hh.orig	2014-04-29 13:44:30.122766402 -0300
++++ ppl-1.1/src/Generator_System_defs.hh	2014-04-29 13:44:48.167767093 -0300
+@@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Poly_Con_Relation_defs.hh"
+ #include "Polyhedron_types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -679,7 +680,7 @@ copy(gs.begin(), gs.end(), ostream_itera
+ class Parma_Polyhedra_Library::Generator_System_const_iterator
+   : public std::iterator<std::forward_iterator_tag,
+         Generator,
+-        ptrdiff_t,
++        std::ptrdiff_t,
+         const Generator*,
+         const Generator&> {
+ public:
+diff -up ppl-1.1/src/Grid_Generator_System_defs.hh.orig ppl-1.1/src/Grid_Generator_System_defs.hh
+--- ppl-1.1/src/Grid_Generator_System_defs.hh.orig	2014-04-29 13:45:26.073768544 -0300
++++ ppl-1.1/src/Grid_Generator_System_defs.hh	2014-04-29 13:45:42.535769175 -0300
+@@ -31,6 +31,7 @@ site: http://bugseng.com/products/ppl/ .
+ #include "Variables_Set_types.hh"
+ #include "Polyhedron_types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -277,7 +278,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+                            Grid_Generator,
+-                           ptrdiff_t,
++                           std::ptrdiff_t,
+                            const Grid_Generator*,
+                            const Grid_Generator&> {
+   public:
diff --git a/pkgs/development/libraries/ppl/upstream-based.patch b/pkgs/development/libraries/ppl/upstream-based.patch
deleted file mode 100644
index 551050f67bf..00000000000
--- a/pkgs/development/libraries/ppl/upstream-based.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=447928
---- ppl-1.0/src/p_std_bits.cc.org	2012-12-30 00:37:03.033948083 +0100
-+++ ppl-1.0/src/mp_std_bits.cc	2012-12-30 00:44:12.893019313 +0100
-@@ -25,6 +25,9 @@
- #include "ppl-config.h"
- #include "mp_std_bits.defs.hh"
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- const bool std::numeric_limits<mpz_class>::is_specialized;
- const int std::numeric_limits<mpz_class>::digits;
- const int std::numeric_limits<mpz_class>::digits10;
-@@ -70,3 +73,6 @@
- const bool std::numeric_limits<mpq_class>::traps;
- const bool std::numeric_limits<mpq_class>::tininess_before;
- const std::float_round_style std::numeric_limits<mpq_class>::round_style;
-+
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
---- ppl-1.0/src/mp_std_bits.defs.hh.org	2012-12-30 00:37:03.037948187 +0100
-+++ ppl-1.0/src/mp_std_bits.defs.hh	2012-12-30 00:42:32.002424189 +0100
-@@ -38,6 +38,9 @@
- #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
- void swap(mpq_class& x, mpq_class& y);
- 
-+#if __GNU_MP_VERSION < 5 \
-+  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- namespace std {
- 
- #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
-@@ -164,6 +167,9 @@
- 
- } // namespace std
- 
-+#endif // __GNU_MP_VERSION < 5
-+       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
-+
- #include "mp_std_bits.inlines.hh"
- 
- #endif // !defined(PPL_mp_std_bits_defs_hh)

From 3cd5fd8bb3fc4b824e89cb800716989a332f20f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 16:12:25 +0200
Subject: [PATCH 054/123] More efficient version of filterAttrs

---
 lib/attrsets.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index cb4091b916c..d81d69b1402 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -76,7 +76,7 @@ rec {
        => { foo = 1; }
   */
   filterAttrs = pred: set:
-    listToAttrs (fold (n: ys: let v = set.${n}; in if pred n v then [(nameValuePair n v)] ++ ys else ys) [] (attrNames set));
+    listToAttrs (concatMap (name: let v = set.${name}; in if pred name v then [(nameValuePair name v)] else []) (attrNames set));
 
 
   /* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list:

From f14dab05d635711daef90639f84ef3170abb216c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 16:32:52 +0200
Subject: [PATCH 055/123] optionAttrSetToDocList: O(n^2) -> O(n)

This shaves about 10% off memory consumption of NixOS evaluation.
---
 lib/options.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index bfc5b5fa2ae..bb72ad6d125 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -83,7 +83,7 @@ rec {
   optionAttrSetToDocList = optionAttrSetToDocList' [];
 
   optionAttrSetToDocList' = prefix: options:
-    fold (opt: rest:
+    concatMap (opt:
       let
         docOption = rec {
           name = showOption opt.loc;
@@ -101,8 +101,7 @@ rec {
           let ss = opt.type.getSubOptions opt.loc;
           in if ss != {} then optionAttrSetToDocList' opt.loc ss else [];
       in
-        # FIXME: expensive, O(n^2)
-        [ docOption ] ++ subOptions ++ rest) [] (collect isOption options);
+        [ docOption ] ++ subOptions) (collect isOption options);
 
 
   /* This function recursively removes all derivation attributes from

From 554cbe9c4bf03b012f1afcc962bc335785ac9af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 21 Jul 2015 12:42:41 +0200
Subject: [PATCH 056/123] scikitlearn: really use 0.16.1 version as noted in
 the name

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 29e2919a380..3d05fddc035 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11985,12 +11985,12 @@ let
   };
 
 
-  scikitlearn = buildPythonPackage {
+  scikitlearn = buildPythonPackage rec {
     name = "scikit-learn-0.16.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz";
-      sha256 = "19jzmbi3j4ix8418i80ayl595dwyi4gy474kb2nc1v8kdwgqi2hs";
+      url = "https://pypi.python.org/packages/source/s/scikit-learn/${name}.tar.gz";
+      sha256 = "1r761qmsq2mnl8sapplbx0ipj6i7ppr2cmz009q5rjana0liwwn0";
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];

From d82946b2bf4cf2b2520d9e925f07c57e25521dfd Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Thu, 23 Jul 2015 10:58:17 +0200
Subject: [PATCH 057/123] sic: init at 1.2

---
 .../networking/irc/sic/default.nix             | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/sic/default.nix

diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix
new file mode 100644
index 00000000000..fef2b6c4cac
--- /dev/null
+++ b/pkgs/applications/networking/irc/sic/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "sic-${version}";
+  version = "1.2";
+
+  makeFlags = "PREFIX=$out";
+  src = fetchurl {
+    url = "http://dl.suckless.org/tools/sic-${version}.tar.gz";
+    sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";
+  };
+
+  meta = {
+    description = "Simple IRC client";
+    homepage = http://tools.suckless.org/sic/;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c14725cce1..432b113edf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2925,6 +2925,8 @@ let
 
   shellinabox = callPackage ../servers/shellinabox { };
 
+  sic = callPackage ../applications/networking/irc/sic { };
+
   siege = callPackage ../tools/networking/siege {};
 
   sigil = callPackage ../applications/editors/sigil { };

From 637e35deb99c5efbb8bd760a3ad08d3899534ead Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 17:19:21 +0200
Subject: [PATCH 058/123] Use foldl' instead of fold in some places

---
 lib/lists.nix   |  8 ++++++--
 lib/modules.nix | 14 +++++++-------
 lib/options.nix |  6 +++---
 lib/strings.nix |  2 +-
 lib/types.nix   |  2 +-
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index fa8cbddfd94..9cb164aaade 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -38,6 +38,10 @@ rec {
     in foldl' (length list - 1);
 
 
+  # Strict version of foldl.
+  foldl' = builtins.foldl' or foldl;
+
+
   # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] ==
   # ["a-1" "b-2"]'
   imap = f: list:
@@ -59,7 +63,7 @@ rec {
   # == [1 2 3 4 5]' and `flatten 1 == [1]'.
   flatten = x:
     if isList x
-    then fold (x: y: (flatten x) ++ y) [] x
+    then foldl' (x: y: x ++ (flatten y)) [] x
     else [x];
 
 
@@ -96,7 +100,7 @@ rec {
 
   # Count how many times function `pred' returns true for the elements
   # of `list'.
-  count = pred: fold (x: c: if pred x then c + 1 else c) 0;
+  count = pred: foldl' (c: x: if pred x then c + 1 else c) 0;
 
 
   # Return a singleton list or an empty list, depending on a boolean
diff --git a/lib/modules.nix b/lib/modules.nix
index ea600127617..22e8b200f76 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -76,8 +76,8 @@ rec {
           else yieldConfig (prefix ++ [n]) v) set) ["_definedNames"];
         in
         if options._module.check.value && set ? _definedNames then
-          fold (m: res:
-            fold (name: res:
+          foldl' (res: m:
+            foldl' (res: name:
               if set ? ${name} then res else throw "The option `${showOption (prefix ++ [name])}' defined in `${m.file}' does not exist.")
               res m.names)
             res set._definedNames
@@ -225,7 +225,7 @@ rec {
      'opts' is a list of modules.  Each module has an options attribute which
      correspond to the definition of 'loc' in 'opt.file'. */
   mergeOptionDecls = loc: opts:
-    fold (opt: res:
+    foldl' (res: opt:
       if opt.options ? default && res ? default ||
          opt.options ? example && res ? example ||
          opt.options ? description && res ? description ||
@@ -251,7 +251,7 @@ rec {
             else if opt.options ? options then map (coerceOption opt.file) options' ++ res.options
             else res.options;
         in opt.options // res //
-          { declarations = [opt.file] ++ res.declarations;
+          { declarations = res.declarations ++ [opt.file];
             options = submodules;
           }
     ) { inherit loc; declarations = []; options = []; } opts;
@@ -302,8 +302,8 @@ rec {
         in
           processOrder (processOverride (processIfAndMerge defs));
 
-        # Type-check the remaining definitions, and merge them
-        mergedValue = fold (def: res:
+        # Type-check the remaining definitions, and merge them.
+        mergedValue = foldl' (res: def:
           if type.check def.value then res
           else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
           (type.merge loc defsFinal) defsFinal;
@@ -384,7 +384,7 @@ rec {
       defaultPrio = 100;
       getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio;
       min = x: y: if x < y then x else y;
-      highestPrio = fold (def: prio: min (getPrio def) prio) 9999 defs;
+      highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs;
       strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
     in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;
 
diff --git a/lib/options.nix b/lib/options.nix
index bb72ad6d125..6e8e9ce0006 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -53,8 +53,8 @@ rec {
     if length list == 1 then head list
     else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
     else if all isList list then concatLists list
-    else if all isAttrs list then fold lib.mergeAttrs {} list
-    else if all isBool list then fold lib.or false list
+    else if all isAttrs list then foldl' lib.mergeAttrs {} list
+    else if all isBool list then foldl' lib.or false list
     else if all isString list then lib.concatStrings list
     else if all isInt list && all (x: x == head list) list then head list
     else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}.";
@@ -68,7 +68,7 @@ rec {
   /* "Merge" option definitions by checking that they all have the same value. */
   mergeEqualOption = loc: defs:
     if defs == [] then abort "This case should never happen."
-    else fold (def: val:
+    else foldl' (val: def:
       if def.value != val then
         throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}."
       else
diff --git a/lib/strings.nix b/lib/strings.nix
index d9f7f6c2db8..f0ecb15ab2d 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -12,7 +12,7 @@ rec {
 
 
   # Concatenate a list of strings.
-  concatStrings = lib.fold (x: y: x + y) "";
+  concatStrings = lib.foldl' (x: y: x + y) "";
 
 
   # Map a function over a list and concatenate the resulting strings.
diff --git a/lib/types.nix b/lib/types.nix
index 0a54a5598f1..49f24b022de 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -88,7 +88,7 @@ rec {
     attrs = mkOptionType {
       name = "attribute set";
       check = isAttrs;
-      merge = loc: fold (def: mergeAttrs def.value) {};
+      merge = loc: foldl' (res: def: mergeAttrs res def.value) {};
     };
 
     # derivation is a reserved keyword.

From 0ae8b365b35fa1c3cac700ce34b37012f96d7deb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 17:41:35 +0200
Subject: [PATCH 059/123] Rename misc.nix -> deprecated.nix

---
 lib/attrsets.nix                 | 3 +--
 lib/default.nix                  | 2 +-
 lib/{misc.nix => deprecated.nix} | 2 --
 lib/options.nix                  | 1 -
 lib/strings.nix                  | 2 ++
 lib/trivial.nix                  | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)
 rename lib/{misc.nix => deprecated.nix} (99%)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index d81d69b1402..20be2002402 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -6,7 +6,6 @@ with {
   inherit (import ./default.nix) fold;
   inherit (import ./strings.nix) concatStringsSep;
   inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
-  inherit (import ./misc.nix) maybeAttr;
 };
 
 rec {
@@ -86,7 +85,7 @@ rec {
   foldAttrs = op: nul: list_of_attrs:
     fold (n: a:
         fold (name: o:
-          o // (listToAttrs [{inherit name; value = op n.${name} (maybeAttr name nul a); }])
+          o // (listToAttrs [{inherit name; value = op n.${name} (a.${name} or nul); }])
         ) a (attrNames n)
     ) {} list_of_attrs;
 
diff --git a/lib/default.nix b/lib/default.nix
index 4b6027c437b..cd0d8161c8c 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -11,7 +11,7 @@ let
   types = import ./types.nix;
   meta = import ./meta.nix;
   debug = import ./debug.nix;
-  misc = import ./misc.nix;
+  misc = import ./deprecated.nix;
   maintainers = import ./maintainers.nix;
   platforms = import ./platforms.nix;
   systems = import ./systems.nix;
diff --git a/lib/misc.nix b/lib/deprecated.nix
similarity index 99%
rename from lib/misc.nix
rename to lib/deprecated.nix
index fd20ce25010..54c253f2c34 100644
--- a/lib/misc.nix
+++ b/lib/deprecated.nix
@@ -203,8 +203,6 @@ rec {
     in
       work startSet [] [];
 
-  genericClosure = builtins.genericClosure or lazyGenericClosure;
-
   innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else 
         innerModifySumArgs f x (a // b);
   modifySumArgs = f: x: innerModifySumArgs f x {};
diff --git a/lib/options.nix b/lib/options.nix
index 6e8e9ce0006..5c543f56bcf 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -4,7 +4,6 @@ let lib = import ./default.nix; in
 
 with import ./trivial.nix;
 with import ./lists.nix;
-with import ./misc.nix;
 with import ./attrsets.nix;
 with import ./strings.nix;
 
diff --git a/lib/strings.nix b/lib/strings.nix
index f0ecb15ab2d..895b230744f 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -210,6 +210,7 @@ rec {
   # standard GNU Autoconf scripts.
   enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";
 
+
   # Create a fixed width string with additional prefix to match required width
   fixedWidthString = width: filler: str:
     let
@@ -219,6 +220,7 @@ rec {
       assert strw <= width;
       if strw == width then str else filler + fixedWidthString reqWidth filler str;
 
+
   # Format a number adding leading zeroes up to fixed width
   fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
 }
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 8addde1b86c..9fd5a7e1c57 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -22,7 +22,7 @@ rec {
   inherit (builtins)
     pathExists readFile isBool isFunction
     isInt add sub lessThan
-    seq deepSeq;
+    seq deepSeq genericClosure;
 
   # Return the Nixpkgs version number.
   nixpkgsVersion =

From 4cc6c83477cd63fe220b08d8106d1aa7aa283dbf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 18:31:17 +0200
Subject: [PATCH 060/123] concatLists (map ...) -> concatMap

---
 lib/modules.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 22e8b200f76..80268e51e11 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -182,18 +182,18 @@ rec {
         let
           loc = prefix ++ [name];
           # Get all submodules that declare ‘name’.
-          decls = concatLists (map (m:
+          decls = concatMap (m:
             if m.options ? ${name}
               then [ { inherit (m) file; options = m.options.${name}; } ]
               else []
-            ) options);
+            ) options;
           # Get all submodules that define ‘name’.
-          defns = concatLists (map (m:
+          defns = concatMap (m:
             if m.config ? ${name}
               then map (config: { inherit (m) file; inherit config; })
                 (pushDownProperties m.config.${name})
               else []
-            ) configs);
+            ) configs;
           nrOptions = count (m: isOption m.options) decls;
           # Extract the definitions for this loc
           defns' = map (m: { inherit (m) file; value = m.config.${name}; })

From e7c209e5a3ecc748e76ee2d87503294cdd13b400 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 18:31:39 +0200
Subject: [PATCH 061/123] gdb: Update to 7.9.1

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

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 16ab1f8e5dc..d50822d4949 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.9";
+  basename = "gdb-7.9.1";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,11 +27,9 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "14l3hhsy7fmpn2dk7ivc67gnbjdhkxlq90kxijpzfa35l58mcccv";
+    sha256 = "0h5sfg4ndhb8q4fxbq0hdxfjp35n6ih96f6x8yvb418s84x5976d";
   };
 
-  # patches = [ ./edit-signals.patch ];
-
   # I think python is not a native input, but I leave it
   # here while I will not need it cross building
   nativeBuildInputs = [ texinfo python perl ]

From 89cda4c95a2447973ca4d5be251fc7e1d83fa2a9 Mon Sep 17 00:00:00 2001
From: "Ryan Scheel (Havvy)" <ryan.havvy@gmail.com>
Date: Thu, 23 Jul 2015 06:25:15 +0200
Subject: [PATCH 062/123] iojs (2.3.4 -> 2.4.0)

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

diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index 1f7db61090e..d5f9baa0528 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.3.4";
+  version = "2.4.0";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "1h9cjrs93c8rdycc0ahhc27wv826211aljvfmxfg8jdmg6nvibhq";
+    sha256 = "0g81bn8q4zgm8skkbxbzwa22dnpbing4b5wjqacvpxq3ygz4c98y";
   };
 
   prePatch = ''

From ab4291249896e8996e4ae523f5e33a6da2f6e4b3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Jul 2015 19:29:35 +0200
Subject: [PATCH 063/123] ocaml-macaque: 0.7.1 -> 0.7.2

---
 pkgs/development/ocaml-modules/macaque/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix
index f2d13ad1f13..99c2a292fe8 100644
--- a/pkgs/development/ocaml-modules/macaque/default.nix
+++ b/pkgs/development/ocaml-modules/macaque/default.nix
@@ -1,10 +1,10 @@
-{stdenv, fetchurl, ocaml, findlib, pgocaml, camlp4}:
+{ stdenv, fetchzip, ocaml, findlib, pgocaml, camlp4 }:
 
 stdenv.mkDerivation {
-  name = "ocaml-macaque-0.7.1";
-  src = fetchurl {
-    url = https://github.com/ocsigen/macaque/archive/0.7.1.tar.gz;
-    sha256 = "0wnq3pgpcrfpivr8j7p827rhag6hdx0yr0bdvma0hw1g30vwf9qa";
+  name = "ocaml-macaque-0.7.2";
+  src = fetchzip {
+    url = https://github.com/ocsigen/macaque/archive/0.7.2.tar.gz;
+    sha256 = "14i0a8cndzndjmlkyhf31r451q99cnkndgxcj0id4qjqhdl4bmjv";
   };
 
   buildInputs = [ ocaml findlib camlp4 ];

From aa8bb63248da7d21dc7a6eec364f6c8962a0aadc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Jul 2015 19:32:21 +0200
Subject: [PATCH 064/123] ocaml-fileutils: 0.4.5 -> 0.5.0

---
 .../ocaml-modules/fileutils/default.nix            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix
index 2fbbabfd36b..7a8a80a446c 100644
--- a/pkgs/development/ocaml-modules/fileutils/default.nix
+++ b/pkgs/development/ocaml-modules/fileutils/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchurl, ocaml, findlib }:
+{ stdenv, fetchurl, ocaml, findlib, ounit }:
 
 stdenv.mkDerivation {
-  name = "ocaml-fileutils-0.4.5";
+  name = "ocaml-fileutils-0.5.0";
 
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/1194/ocaml-fileutils-0.4.5.tar.gz;
-    sha256 = "0rlqmcgjrfjihjgw5cfmack169cag8054gh5yrqph15av3lx5cra";
+    url = https://forge.ocamlcore.org/frs/download.php/1531/ocaml-fileutils-0.5.0.tar.gz;
+    sha256 = "0xs96nlrrm335mcsgsxnqzspiqyfn26b0jjxm72br7c7ax534n47";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ounit ];
+
+  configureFlags = "--enable-tests";
+  doCheck = true;
+  checkTarget = "test";
 
   createFindlibDestdir = true;
 

From a74f3a62701e64cabd47e02bd8f79ba51d4c3fb8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Jul 2015 19:36:24 +0200
Subject: [PATCH 065/123] ocaml-csv: 1.4 -> 1.4.1

---
 pkgs/development/ocaml-modules/csv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
index 16f755f17b3..30f96a801d8 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation {
 
-  name = "ocaml-csv-1.4";
+  name = "ocaml-csv-1.4.1";
 
   src = fetchzip {
-    url = https://github.com/Chris00/ocaml-csv/releases/download/1.4/csv-1.4.tar.gz;
-    sha256 = "0si0v79rxzyzmgyhd6lidpzxdlcpprlhg0pgrsf688g83xsclkwa";
+    url = https://github.com/Chris00/ocaml-csv/releases/download/1.4.1/csv-1.4.1.tar.gz;
+    sha256 = "1z38qy92lq8qh91bs70vsv868szainif53a2y6rf47ijdila25j4";
   };
 
   buildInputs = [ ocaml findlib ];

From 5fcdd7c0dc0e864653a0e4ac440eff77e51458d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 19:47:16 +0200
Subject: [PATCH 066/123] nixopsUnstable: disable broken documentation build

---
 pkgs/tools/package-management/nixops/unstable.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 6f10989f3c7..2ad826b928b 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -26,7 +26,7 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "01n2ykszrnqr3kqqdg1n2l8wm38yhri7r3d7b0abklsslz9dlvmy";
   };
 
-  buildInputs = [ pythonPackages.nose pythonPackages.coverage ];
+  buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ];
 
   propagatedBuildInputs =
     [ pythonPackages.prettytable
@@ -43,16 +43,17 @@ pythonPackages.buildPythonPackage rec {
       # Backward compatibility symlink.
       ln -s nixops $out/bin/charon
 
-      make -C doc/manual install \
+      # Documentation build is currently broken. Re-try with newer version.
+      : make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
         docdir=$out/share/doc/nixops mandir=$out/share/man
 
       mkdir -p $out/share/nix/nixops
-      cp -av nix/* $out/share/nix/nixops
+      cp -av "nix/"* $out/share/nix/nixops
 
       # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
       # the version of openssh is causing errors when have big networks (40+)
       wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
-    ''; # */
+    '';
 
   meta = {
     homepage = https://github.com/NixOS/nixops;

From dc5084b4d1899db2ccc8dffe396a6b4912c226e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 19:47:43 +0200
Subject: [PATCH 067/123] nixops: fix Emacs syntax highlighting

---
 pkgs/tools/package-management/nixops/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index b85591b0695..374026b7597 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -29,7 +29,7 @@ pythonPackages.buildPythonPackage rec {
         docdir=$out/share/doc/nixops mandir=$out/share/man
 
       mkdir -p $out/share/nix/nixops
-      cp -av nix/* $out/share/nix/nixops
+      cp -av "nix/"* $out/share/nix/nixops
 
       # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
       # the version of openssh is causing errors when have big networks (40+)

From 55ad2d21508333ec21171ceb9e7a16ac3baa6f32 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Sat, 18 Jul 2015 11:06:59 +0200
Subject: [PATCH 068/123] Fix wyrd to compile with ocaml 4.02

camlp4 is now a separate package instead of shipping within the ocaml package
---
 pkgs/tools/misc/wyrd/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index d76e393aaaa..d02ce41b6aa 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, ncurses, remind }:
+{ stdenv, fetchurl, ocaml, ncurses, remind, camlp4 }:
 
 stdenv.mkDerivation rec {
   version = "1.4.6";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj";
   };
 
-  buildInputs = [ ocaml ncurses remind ];
+  buildInputs = [ ocaml ncurses remind camlp4 ];
 
   preferLocalBuild = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 647013167f5..85035583af9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3440,7 +3440,9 @@ let
 
   wv2 = callPackage ../tools/misc/wv2 { };
 
-  wyrd = callPackage ../tools/misc/wyrd { };
+  wyrd = callPackage ../tools/misc/wyrd {
+    inherit (ocamlPackages) camlp4;
+  };
 
   x86info = callPackage ../os-specific/linux/x86info { };
 

From 5342e2a598e58a658296de883331048e2329d08a Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Mon, 20 Jul 2015 09:15:35 +0200
Subject: [PATCH 069/123] Make ocaml's mysql propagate mysql.lib

There was a typo preventing other packages from properly building
---
 pkgs/development/ocaml-modules/mysql/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index fc26d8b989c..3131d8212e4 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  propagatedbuildInputs = [ mysql.lib ];
+  propagatedBuildInputs = [ mysql.lib ];
 
   preConfigure = ''
     export LDFLAGS="-L${mysql.lib}/lib/mysql"

From d1e6f055fe01e3e13a6ba603dd815da2a4d991c8 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Tue, 21 Jul 2015 17:14:28 +0200
Subject: [PATCH 070/123] Fix haxe to compile with ocaml 4.02

camlp4 is now a separate package
---
 pkgs/development/compilers/haxe/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index d9c9f91df6a..41c7a476b27 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, ocaml, zlib, neko }:
+{ stdenv, fetchgit, ocaml, zlib, neko, camlp4 }:
 
 stdenv.mkDerivation {
   name = "haxe-3.1.3";
 
-  buildInputs = [ocaml zlib neko];
+  buildInputs = [ocaml zlib neko camlp4];
 
   src = fetchgit {
     url = "https://github.com/HaxeFoundation/haxe.git";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85035583af9..81700f14669 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3972,7 +3972,9 @@ let
     overrides = config.haskellPackageOverrides or (self: super: {});
   };
 
-  haxe = callPackage ../development/compilers/haxe { };
+  haxe = callPackage ../development/compilers/haxe {
+    inherit (ocamlPackages) camlp4;
+  };
   hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
 
   hhvm = callPackage ../development/compilers/hhvm { };

From b6f581a84863a98f0314b80b9809a2eb0e278c05 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 11:58:47 +0200
Subject: [PATCH 071/123] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/2a867ffd9fe07e45bda9d4bb5b6ed6973c0d5318
 with hackage2nix revision 3606ad40536a2dae452307184b9bd70a2eff8c89

---
 .../haskell-modules/hackage-packages.nix      | 1048 +++++++++++------
 1 file changed, 690 insertions(+), 358 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3d5a00e2d8c..f15a27cec91 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10851,18 +10851,19 @@ self: {
 
   "Network-NineP" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, convertible
-     , monad-loops, mstate, mtl, network, NineP, regex-posix, stateref
-     , transformers
+     , exceptions, monad-loops, monad-peel, mstate, mtl, network, NineP
+     , regex-posix, stateref, transformers
      }:
      mkDerivation {
        pname = "Network-NineP";
-       version = "0.3.0";
-       sha256 = "02igsbmhkpkaxdpdhkl6vb7kzryhg7p5bb59irykz0dkg095wr89";
+       version = "0.4.0";
+       sha256 = "1h6p1p16wvsi6pjpz2xdvbljd394bzpqqfiah7aq9d7f7zh7hzid";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base binary bytestring containers convertible monad-loops mstate
-         mtl network NineP regex-posix stateref transformers
+         base binary bytestring containers convertible exceptions
+         monad-loops monad-peel mstate mtl network NineP regex-posix
+         stateref transformers
        ];
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
@@ -17236,15 +17237,14 @@ self: {
      }:
      mkDerivation {
        pname = "active";
-       version = "0.2.0.3";
-       sha256 = "18z6gki5bjr4847r90aw89j8gkfs0w9dv1w2na4msd36i3jym3sc";
+       version = "0.2.0.4";
+       sha256 = "1xm2y8knqhd883c41194h323vchv4hx57wl32l9f64kf7gdglag0";
        buildDepends = [
          base lens linear semigroupoids semigroups vector
        ];
        testDepends = [
          base lens linear QuickCheck semigroupoids semigroups vector
        ];
-       jailbreak = true;
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18116,8 +18116,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.2";
-       sha256 = "0pg1wqssqqdjd0cafimsy8ibmxfyjk16w10ibkj13a6ggzfn75j1";
+       version = "4.3";
+       sha256 = "01vcjc6i040lp92xhxma6sp3iffam9d7nxqch6i64pajvd8cq97j";
        buildDepends = [ array base containers mtl random vector ];
        homepage = "http://github.com/dsorokin/aivika";
        description = "A multi-paradigm simulation library";
@@ -18164,8 +18164,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-chart";
-       version = "4.2";
-       sha256 = "15aqq8mmjybi7kkrfsmablf7ymi328p9y6nsr8pc7sv144fadaf0";
+       version = "4.3";
+       sha256 = "01wfjk4li0l2m7lqs9r6gxsv77wg94vdvipa05qynnsd9ldjnsfd";
        buildDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
@@ -19452,23 +19452,24 @@ self: {
   "amqp" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
-     , monad-control, network, network-uri, split, text, vector, xml
+     , monad-control, network, network-uri, split, stm, text, vector
+     , xml
      }:
      mkDerivation {
        pname = "amqp";
-       version = "0.12.3";
-       sha256 = "17kvhn6s3grv5ygswkk0x8qclr8j4nxgv04z9q6wac9vydjsaz8m";
+       version = "0.13.0";
+       sha256 = "1qnknyk8xizq5i94s9zv7prqqcpccigc92c6jqqh82y2yqz5xnjj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base binary bytestring clock connection containers
-         data-binary-ieee754 monad-control network network-uri split text
-         vector xml
+         data-binary-ieee754 monad-control network network-uri split stm
+         text vector xml
        ];
        testDepends = [
          base binary bytestring clock connection containers
          data-binary-ieee754 hspec hspec-expectations network network-uri
-         split text vector
+         split stm text vector
        ];
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
@@ -19972,15 +19973,15 @@ self: {
 
   "api-builder" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , Cabal, containers, either, hspec, HTTP, http-client, http-conduit
+     , Cabal, containers, hspec, HTTP, http-client, http-conduit
      , http-types, text, transformers
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.7.4.0";
-       sha256 = "0af0ld0rlrpvbl4iw3g5n5bjij5z5jq2sbd9fqila5891qkvb30d";
+       version = "0.9.1.0";
+       sha256 = "1s9qxlinkg80idjcm246kgjg1k43pb4vvs0vd601pgz7im59qb1a";
        buildDepends = [
-         aeson attoparsec base bifunctors bytestring either HTTP http-client
+         aeson attoparsec base bifunctors bytestring HTTP http-client
          http-conduit http-types text transformers
        ];
        testDepends = [
@@ -22116,15 +22117,15 @@ self: {
 
   "aur" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, filepath, lens
-     , lens-aeson, mtl, text, vector, wreq-sb
+     , lens-aeson, mtl, text, vector, wreq
      }:
      mkDerivation {
        pname = "aur";
-       version = "2.0.4";
-       sha256 = "1f6j85nz1mb9cn4l4pqv6jcx42m6rp8fj1g4xrfp8k2y9yyx7hjn";
+       version = "3.0.0";
+       sha256 = "1sf76lysp8xchym78ha4glrw11hxic5g684mm8h6w0n05x1ywxcn";
        buildDepends = [
          aeson aeson-pretty base filepath lens lens-aeson mtl text vector
-         wreq-sb
+         wreq
        ];
        homepage = "https://github.com/fosskers/haskell-aur";
        description = "Access metadata from the Arch Linux User Repository";
@@ -23125,8 +23126,8 @@ self: {
      }:
      mkDerivation {
        pname = "bake";
-       version = "0.3";
-       sha256 = "0h0byqv9m0jp5awbjcad0gggbgp66qqws6qvyfxwzk5jgwdifa0k";
+       version = "0.4";
+       sha256 = "1xxv78i2q9hiw30vkbcx09nabqv88g3a6k872ckm9wk8isrnw2zz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -25750,8 +25751,8 @@ self: {
      }:
      mkDerivation {
        pname = "biostockholm";
-       version = "0.3.2";
-       sha256 = "13rzlb2s3y8vp969s8z1gxmiccvpgrv4yxpim4bjbyc2yblbbnk7";
+       version = "0.3.4";
+       sha256 = "04k7cl8fjsi2mv60p2qg2nmy86z2adw9gzjnkxffqsc1q85y4lz7";
        buildDepends = [
          attoparsec attoparsec-conduit base biocore blaze-builder
          blaze-builder-conduit bytestring conduit containers deepseq
@@ -30868,8 +30869,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.4.16";
-       sha256 = "0mvd80gn6z8iyy8y43drjzmq479zh2zsz3swmlmgvmbvsb1kchlb";
+       version = "6.4.20";
+       sha256 = "1p0nm6gb7hvxvfkgrync1a66zl58s041pgnkly2vx91cpm6yavcm";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -34587,8 +34588,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.4.2";
-       sha256 = "1shx58xg4lqf0dj50m2svh132xlzasgg6j175hxk8zf8k1v9b1zl";
+       version = "1.2.4.3";
+       sha256 = "101kbmymsjlpsd9a717fn94y2fjgnxwl9j3cmfrah43g28r45sc8";
        buildDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base
@@ -34685,8 +34686,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "1.0.1";
-       sha256 = "014n3qhn9flwj43zjp62vagp5df9ll6nkjk1x9qpagni1vf9cbqq";
+       version = "1.0.1.1";
+       sha256 = "02x0n4yar1s3x73pbaxs6ghd5kihl3wz3svrvvm24xnmwv5j9aaz";
        buildDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra filepath monad-control mono-traversable
@@ -34732,8 +34733,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-extra";
-       version = "1.1.9";
-       sha256 = "1bs28gs0xfsqywhm8bchap9zr10wxfrlpdphflhzkm8am2bgz55i";
+       version = "1.1.9.1";
+       sha256 = "18x01yll1jfv1p9kb7529k8gdh0lav4pbqcqkam2qr9jxxdy26rz";
        buildDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
@@ -34821,12 +34822,17 @@ self: {
      }) {};
 
   "conf" = callPackage
-    ({ mkDerivation, base, haskell-src }:
+    ({ mkDerivation, base, haskell-src, HUnit, test-framework
+     , test-framework-hunit, test-framework-th
+     }:
      mkDerivation {
        pname = "conf";
-       version = "0.1.0.0";
-       sha256 = "15zd72l2izdiw79hldf34pymxc4d9r06db91x6p2mfv2i31wy2n2";
+       version = "0.1.1.0";
+       sha256 = "1mxrr14188ikizyxb06764qq1iwhnh19g150mz310q8yw6cypbfw";
        buildDepends = [ base haskell-src ];
+       testDepends = [
+         base HUnit test-framework test-framework-hunit test-framework-th
+       ];
        jailbreak = true;
        description = "Parser for Haskell-based configuration files";
        license = stdenv.lib.licenses.bsd3;
@@ -38611,8 +38617,8 @@ self: {
      }:
      mkDerivation {
        pname = "dash-haskell";
-       version = "1.1.0.1";
-       sha256 = "1m82zpr37jdqr06ynqz4bbnvy1s81756frcgfiyk4wvlmmcl2fyk";
+       version = "1.1.0.2";
+       sha256 = "1h22ay2cl5j2ngm2xi2hyvvprnmz48qcpzxiq9ldkzx8gg3gs36j";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -39212,12 +39218,11 @@ self: {
      }:
      mkDerivation {
        pname = "data-lens";
-       version = "2.10.6";
-       sha256 = "0pnn84m6xvqvxmqpddsi4db1w65788yrwdkpfm9z1vkkajqixaxj";
+       version = "2.10.7";
+       sha256 = "0l70jzys2qb31cyq3nci97i01ncadkhizxvc9c3psxcd2n28l69v";
        buildDepends = [
          base comonad containers semigroupoids transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/roconnor/data-lens/";
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -39266,10 +39271,9 @@ self: {
     ({ mkDerivation, base, data-lens, template-haskell }:
      mkDerivation {
        pname = "data-lens-template";
-       version = "2.1.8";
-       sha256 = "0w8x5zn3d98z0q74bqfgkb9s0ca9hd1xc53gjl759s77wm4iwa0q";
+       version = "2.1.9";
+       sha256 = "0dpj3a1dj5l5jll2f0flj3wss9h2jbsljihrwh68zbb92pcgb56g";
        buildDepends = [ base data-lens template-haskell ];
-       jailbreak = true;
        homepage = "http://github.com/roconnor/data-lens-template/";
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
@@ -39877,14 +39881,21 @@ self: {
      }) {};
 
   "datetime" = callPackage
-    ({ mkDerivation, base, old-locale, old-time, QuickCheck, time }:
+    ({ mkDerivation, base, HUnit, old-locale, old-time, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , time
+     }:
      mkDerivation {
        pname = "datetime";
-       version = "0.2.1";
-       sha256 = "1yfg3wvi13r725dhfsmcdw4ns3cgl2ayrb5jck0q8b4crk2dlrzg";
-       buildDepends = [ base old-locale old-time QuickCheck time ];
-       homepage = "http://github.com/esessoms/datetime";
-       description = "Utilities to make Data.Time.* easier to use.";
+       version = "0.3.1";
+       sha256 = "0jmxxmv5s9rch84ivfjhqxdqnvqqzvabjs152wyv47h5qmvpag1k";
+       buildDepends = [ base old-locale old-time time ];
+       testDepends = [
+         base HUnit old-locale old-time QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 time
+       ];
+       homepage = "http://github.com/stackbuilders/datetime";
+       description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -40475,8 +40486,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian-build";
-       version = "0.7.1.1";
-       sha256 = "0r2f14h0bpbq861jfa0rgp0y87nq142f80dyjzyzzrdwc8szj120";
+       version = "0.7.2.1";
+       sha256 = "1x3jvrz5y85m9mnp5b8b85f4magbxa4r0yhkw30vgcljph6v7mfm";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -40937,18 +40948,19 @@ self: {
      }) {};
 
   "delta" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, sodium
-     , time
+    ({ mkDerivation, base, containers, directory, filepath
+     , optparse-applicative, process, sodium, time
      }:
      mkDerivation {
        pname = "delta";
-       version = "0.1.2.0";
-       revision = "1";
-       sha256 = "1yk4cb21n4kq0wvsw6lw8s8sc69gnmzfdn9f5zgwsknza0vayi39";
-       editedCabalFile = "5f7c4ae62f0d0758b892ac7002bc31eebfc4e4dcbe1ff141f0135daf5788e6e9";
+       version = "0.2.1.1";
+       sha256 = "06msfi733jmqqgxyx5p4mifjgxrgh0x8ls4j0fkcan5377sydjcv";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers directory filepath sodium time ];
+       buildDepends = [
+         base containers directory filepath optparse-applicative process
+         sodium time
+       ];
        homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.gpl3;
@@ -41491,8 +41503,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.7.1";
-       sha256 = "1cfmklds0l2jyn7p2hldq0riq4m01dxfg9cran6sx65a7d82x96d";
+       version = "0.7.1.1";
+       sha256 = "1klmmh144bdwrg3zs45l6yy1li64r60jygqspxzyzlm8pfgzvgah";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -41502,7 +41514,6 @@ self: {
          lucid-svg mtl split transformers
        ];
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41517,15 +41528,14 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.3.0.2";
-       sha256 = "1ja089hnq24fx5sd5r3r2z76pmwk5w6j93b7hha7m4jylcdjcnpp";
+       version = "1.3.0.3";
+       sha256 = "0962kz1b45hycjij90yxq88wa5qsdll82h16agzf0pm16j8r4v5s";
        buildDepends = [
          base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
          optparse-applicative pango split statestack transformers unix
          vector
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41538,14 +41548,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "1.3.0.1";
-       sha256 = "0ik2kfgs5fi1a51hn9g5sii0n4j9lb0xd9paydz342b7zizy0w70";
+       version = "1.3.0.2";
+       sha256 = "1jklgvkmdhg5ari577jh5y7vr54wjdwyz2hql1n1icbfba5d6p0c";
        buildDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
          optparse-applicative statestack text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41562,8 +41571,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.3.0.3";
-       sha256 = "0sl99ikghfmiwa51iyacgrma844dqn44iw7c9ahx70r4l8j8is2q";
+       version = "1.3.0.4";
+       sha256 = "0mr4m4kl028jxrjldn38kq7zsph6vqwzdjhxd0rznzbwpsnvsnkf";
        buildDepends = [
          base circle-packing colour containers data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -41574,7 +41583,6 @@ self: {
          base containers diagrams-lib HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41587,13 +41595,12 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.3.0.1";
-       sha256 = "1whig632hx03ysiqidaxf29r67xl2skw0pkx454s036gdwl7sqj2";
+       version = "1.3.0.2";
+       sha256 = "0lrzphpia24dk1mxv33c9f5iy18r5d0lfsw92422nhbs36dslyzm";
        buildDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41621,8 +41628,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.3.0.5";
-       sha256 = "00118bnxkgfg4s4h825bl9v1mdb8cfv27l6licmx8z0dch3all9k";
+       version = "0.3.0.6";
+       sha256 = "0pa83kd1b1fnj9plwmz8gsi2nm35ghdsxdxi4w4f7shsgc64nhrj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -41635,7 +41642,6 @@ self: {
          base containers haskell-src-exts lens parsec QuickCheck tasty
          tasty-quickcheck
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
@@ -41667,14 +41673,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-html5";
-       version = "1.3.0.1";
-       sha256 = "1b6qrhqangdd2j3hzgslkq2sgk9wgk9ll9znfcmxpzc9k04aanqc";
+       version = "1.3.0.2";
+       sha256 = "18ifqv5xkk9cd86d3mir1qka2jy35vj4hqycq44z96hhp50yl29j";
        buildDepends = [
          base cmdargs containers data-default-class diagrams-core
          diagrams-lib lens mtl NumInstances optparse-applicative split
          statestack static-canvas text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41691,8 +41696,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.3.0.1";
-       sha256 = "04s21ms9w521fhm7hralq155lwisjv1pszz4cvpl3hc1jm1vwfa3";
+       version = "1.3.0.2";
+       sha256 = "1gvvyzpzzdwzvrh452l6r2709qpbdzx1fi1ysvzalywi3gib69ds";
        buildDepends = [
          active adjunctions array base colour containers data-default-class
          diagrams-core diagrams-solve directory distributive dual-tree
@@ -41701,7 +41706,6 @@ self: {
          process semigroups system-filepath tagged text transformers
          unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -41755,14 +41759,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-postscript";
-       version = "1.3.0.1";
-       sha256 = "0w6ck71hjjx0rl930v2wapznjvrg5jq538gnyidp2yshik8xh2rp";
+       version = "1.3.0.2";
+       sha256 = "0cdhs5ia6jm89h1bxgqm1w9gkjqnw6g0nw13vjasj0fh08nayk7s";
        buildDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          filepath hashable lens monoid-extras mtl semigroups split
          statestack
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -41791,14 +41794,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "1.3.1.2";
-       sha256 = "1shkwhi7yv8cmv8697z7qqax0z7brcmjqlc17hldfflzwniiyk81";
+       version = "1.3.1.3";
+       sha256 = "1gkapj3n2xyy13a819zbckslvv8k5jkdlz7x2dzhcganra9gkcki";
        buildDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
          optparse-applicative Rasterific split unix
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -41837,15 +41839,14 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.3.1.3";
-       sha256 = "0migb5vjlslbxlmbqxl0qdrpsi0ghbiq86rjna57g804r149n7ni";
+       version = "1.3.1.4";
+       sha256 = "009xn6q9qwgi3l4v0rm79309i91m1s0jbng34bbli29s6vzwgjmz";
        buildDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
          monoid-extras mtl old-time optparse-applicative process semigroups
          split text time
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -44109,6 +44110,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "draw-poker" = callPackage
+    ({ mkDerivation, base, random-shuffle, safe }:
+     mkDerivation {
+       pname = "draw-poker";
+       version = "0.1.0.1";
+       revision = "1";
+       sha256 = "16b17qfj3bah468hqsksk2rhyl33m2vyqw0rrs1wyaz75yq35257";
+       editedCabalFile = "62a11039e0b634f0b372c28d87f6fe84f40a33981211c9f2bc077135abcef629";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base random-shuffle safe ];
+       testDepends = [ base ];
+       homepage = "http://tune.hateblo.jp/entry/2015/05/12/023112";
+       description = "playing draw poker";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "drawille" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -44403,17 +44421,16 @@ self: {
      }) {};
 
   "dtw" = callPackage
-    ({ mkDerivation, base, containers, MemoTrie, QuickCheck
-     , test-framework, test-framework-quickcheck2, thyme, vector
-     , vector-space
+    ({ mkDerivation, base, containers, QuickCheck, test-framework
+     , test-framework-quickcheck2, thyme, vector, vector-space
      }:
      mkDerivation {
        pname = "dtw";
-       version = "1.0.0.0";
-       sha256 = "0kcb773sly86lkvnb3ihsswrz432phi3ccizwbf1phzf72kdflzr";
-       buildDepends = [ base containers MemoTrie vector vector-space ];
+       version = "1.0.1.0";
+       sha256 = "15qk8r958pssgwqhxffw45vm5bpvv9wfarv9spaplrnb3sm5bzhk";
+       buildDepends = [ base containers vector vector-space ];
        testDepends = [
-         base containers MemoTrie QuickCheck test-framework
+         base containers QuickCheck test-framework
          test-framework-quickcheck2 thyme vector vector-space
        ];
        jailbreak = true;
@@ -44433,6 +44450,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dump" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, hspec
+     , interpolatedstring-perl6, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "dump";
+       version = "0.2.6";
+       sha256 = "0rhjx4g83pbm0zfqgz8ykfccaq8wa7wspjc6k1n4d1bgcwkc617y";
+       buildDepends = [
+         base haskell-src-meta interpolatedstring-perl6 template-haskell
+         text
+       ];
+       testDepends = [
+         base haskell-src-meta hspec interpolatedstring-perl6
+         template-haskell text
+       ];
+       homepage = "https://github.com/Wizek/dump";
+       description = "Dumps the names and values of expressions to ease debugging";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "duplo" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
      , base64-bytestring, bytestring, containers, directory
@@ -44740,8 +44778,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-pp";
-       version = "0.1.0";
-       sha256 = "1i01k8c75yxdmxz3db4kajpqbgl8lcbfsp9rb9q2kzbk44fc2zpc";
+       version = "0.2.0";
+       sha256 = "03y9sl3xcnp1ixi4y0i1a7frd2bgfvnb0r4pqjs38bvjkz96bbdd";
        buildDepends = [
          ansi-terminal base blaze-builder bytestring Cabal hashable
          unordered-containers utf8-string
@@ -45475,16 +45513,21 @@ self: {
      }) { eibclient = null;};
 
   "eigen" = callPackage
-    ({ mkDerivation, base, bytestring, primitive, vector }:
+    ({ mkDerivation, base, binary, bytestring, mtl, primitive
+     , transformers, vector
+     }:
      mkDerivation {
        pname = "eigen";
-       version = "2.1.0";
-       sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07";
-       buildDepends = [ base bytestring primitive vector ];
-       testDepends = [ base primitive vector ];
-       jailbreak = true;
+       version = "2.1.6";
+       sha256 = "0287j907pasjb7w7bwr6snb4qic7j14msxhps445yjfkqa2arzfz";
+       buildDepends = [
+         base binary bytestring primitive transformers vector
+       ];
+       testDepends = [
+         base binary bytestring mtl primitive transformers vector
+       ];
        homepage = "https://github.com/osidorkin/haskell-eigen";
-       description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)";
+       description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -45848,17 +45891,17 @@ self: {
 
   "elm-init" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , directory, file-embed, filepath, text
+     , directory, file-embed, filepath, text, time
      }:
      mkDerivation {
        pname = "elm-init";
-       version = "0.1.2.1";
-       sha256 = "0x5p5jwxz07m515421xpcw777lgc3bx40mnl0y9fdw2gz4f3svs2";
+       version = "1.0.1.0";
+       sha256 = "0jvdln18dhsxly33ysy1vv1740ri1576x44jn10gjva432rp8rwx";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          aeson aeson-pretty base bytestring containers directory file-embed
-         filepath text
+         filepath text time
        ];
        description = "Set up basic structure for an elm project";
        license = stdenv.lib.licenses.mit;
@@ -46323,6 +46366,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "engine-io-wai" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, engine-io
+     , http-types, mtl, text, transformers, unordered-containers, wai
+     , wai-websockets, websockets
+     }:
+     mkDerivation {
+       pname = "engine-io-wai";
+       version = "1.0.0";
+       sha256 = "0g9h0r2i1lldmdkpnzlqjhxr7jd0v2s2w4gmsw83k1ahr6ia0dg7";
+       buildDepends = [
+         attoparsec base bytestring engine-io http-types mtl text
+         transformers unordered-containers wai wai-websockets websockets
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "engine-io-yesod" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , engine-io, http-types, text, unordered-containers, wai
@@ -46615,11 +46674,10 @@ self: {
     ({ mkDerivation, base, exceptions, mtl }:
      mkDerivation {
        pname = "eprocess";
-       version = "1.7.0";
-       sha256 = "1h4ajq1rraiz7qw7350128n26jnqhzk9iyjzqc3lnbyx87q8j73v";
+       version = "1.7.2";
+       sha256 = "190qgsqj41dbkphjrgljif7q0zjm9ddp8wawc9wx8qklb897jrvj";
        buildDepends = [ base exceptions mtl ];
-       jailbreak = true;
-       description = "*Very* basic Erlang-like process support for Haskell";
+       description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -48094,8 +48152,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.3";
-       sha256 = "12n67ibj6zk7r8hzk0vn6ijfr926h0g6jkwn5krkp79xzdq82apr";
+       version = "1.3.1";
+       sha256 = "1yhd4f4p8f4nfj24rka8rfhr8s86mjpj019f3lbqkr9hnl1crj4l";
        buildDepends = [ base directory filepath process time unix ];
        testDepends = [ base directory filepath QuickCheck time unix ];
        homepage = "https://github.com/ndmitchell/extra#readme";
@@ -48513,8 +48571,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.23.1.7";
-       sha256 = "1yjpbbxxjz8hrqb3arcn74i9s936kr44zg2v27kxmhrin4lnrw4b";
+       version = "0.23.1.8";
+       sha256 = "1772gdqka5hcgs2bq76bba9pca5xx32q3fg9vvkjqd5249rk5gv6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -50607,8 +50665,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.1.0";
-       sha256 = "184arkpffi2z7dayplc47nvyabzr5sig4zs8hc4lilcklv4q9zn6";
+       version = "1.1.1";
+       sha256 = "01zqlb3hh5jsq49ax08nkwvysqq4fgkxpz4sdcman9y9fnxgwjgg";
        buildDepends = [
          base bytestring containers mwc-random primitive profunctors text
          transformers vector
@@ -50786,10 +50844,9 @@ self: {
      }:
      mkDerivation {
        pname = "force-layout";
-       version = "0.4.0.1";
-       sha256 = "1qchmhn6hp91gzds6yqjn4kssp7n3g7vqhl919wf8d3nn4ykz3av";
+       version = "0.4.0.2";
+       sha256 = "0lncciqizp55if5ivlcbv5lqj21hlp2vfi40iagjswf2apxi0w0g";
        buildDepends = [ base containers data-default-class lens linear ];
-       jailbreak = true;
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52222,13 +52279,15 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl";
-       version = "0.1.1.0";
-       sha256 = "07ml9f8x4rw7wg6wib63nayh8mpszrkx0zal9zz0cpjh2f85n10a";
+       version = "0.1.2.0";
+       revision = "1";
+       sha256 = "1b18xzxbbrnmmvjgmzhy5r4ww7rvbli76m7vh3li30fb95k1sznr";
+       editedCabalFile = "d97edefc7ee59578d181dfc36d85b1a82a6e0c9ed1bb602918655a3439a5eb51";
        buildDepends = [
          base hashable transformers unordered-containers vector Yampa
        ];
        jailbreak = true;
-       homepage = "https://github.com/ZioCrocifisso/FWGL";
+       homepage = "https://github.com/ziocroc/FWGL";
        description = "FRP 2D/3D game engine";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52239,16 +52298,16 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl-glfw";
-       version = "0.1.0.3";
+       version = "0.1.0.4";
        revision = "1";
-       sha256 = "1zmvw7945lkghavik72w096rqh8ivjyb9h6j98yjvlj6xf85bsq0";
-       editedCabalFile = "f2a35fcd71bbea225624cf3b6d1f78647e103a1ee1edcc0a7eb9e27b0c4642d8";
+       sha256 = "1pph1arlmi905rkcjcn3yf5ypdmk82363vgdmwg26dbrb2sb4cs8";
+       editedCabalFile = "26e4026f5ac7fe57292c5df79d35894b736728c31cad845f11641d833f789fb8";
        buildDepends = [
          base fwgl gl GLFW-b hashable JuicyPixels transformers
          unordered-containers vector Yampa
        ];
        jailbreak = true;
-       homepage = "https://github.com/ZioCrocifisso/FWGL";
+       homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52259,13 +52318,13 @@ self: {
      }:
      mkDerivation {
        pname = "fwgl-javascript";
-       version = "0.1.0.2";
-       sha256 = "1vgc3dqm0pqac8l17w0fi4xv2rx2bik6n405qzarjnjlyp7czqcm";
+       version = "0.1.0.4";
+       sha256 = "1bwg6dzp2kgny5s6zygdi120pcrdclql22rgp43vhwim5aqkp9d7";
        buildDepends = [
          base fwgl ghcjs-base hashable unordered-containers Yampa
        ];
        jailbreak = true;
-       homepage = "https://github.com/ZioCrocifisso/FWGL";
+       homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
@@ -56765,8 +56824,8 @@ self: {
     ({ mkDerivation, base, hierarchical-clustering }:
      mkDerivation {
        pname = "gsc-weighting";
-       version = "0.2";
-       sha256 = "1mdm0n96gy00wf7lv6c0qxk9bi1ahf58vzrgnh3jfiwhzjivcvlj";
+       version = "0.2.2";
+       sha256 = "0y80j5qk601c965assl8d91k9bpvzijn2z0w64n2ksij9lm6b8p5";
        buildDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
        license = stdenv.lib.licenses.bsd3;
@@ -56931,20 +56990,20 @@ self: {
 
   "gtk-mac-integration" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk
-     , gtk-mac-integration, gtk2hs-buildtools, mtl
+     , gtk-mac-integration-gtk2, gtk2hs-buildtools, mtl
      }:
      mkDerivation {
        pname = "gtk-mac-integration";
-       version = "0.3.0.2";
-       sha256 = "05pihi7fc413j8iwwrdb7p1ckxsjzd8cvayk76hhwnqcyykvjlr5";
+       version = "0.3.1.1";
+       sha256 = "02s5ksr8fkqlbwlq468v93w0is1xa73wswgxahyyvhh51wnqp3ax";
        buildDepends = [ array base containers glib gtk mtl ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk-mac-integration ];
+       pkgconfigDepends = [ gtk-mac-integration-gtk2 ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gtk-mac-integration = null;};
+     }) { gtk-mac-integration-gtk2 = null;};
 
   "gtk-serialized-event" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk, haskell98, mtl
@@ -57189,8 +57248,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3-mac-integration";
-       version = "0.3.0.3";
-       sha256 = "1jzkx10mmmxxv1ys9ywr2sfpy0pxvy8276pbkh0xnypxsyd2sfdn";
+       version = "0.3.1.1";
+       sha256 = "0j6fpzk1gq1y15cjpkq3k1azkn7xvlqiidn3m0g9czz5iy303adv";
        buildDepends = [ array base containers glib gtk3 mtl ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ gtk-mac-integration-gtk3 ];
@@ -58798,8 +58857,8 @@ self: {
      }:
      mkDerivation {
        pname = "hailgun";
-       version = "0.4.0.1";
-       sha256 = "1jwk8rip8d96ivkv2k3dzmppid8dyvkrhgkjrxawgvwjzavfwwfn";
+       version = "0.4.0.3";
+       sha256 = "1c4fd116xhkw0hknzfyxyw7v62wjixcdbdidx804rs8g8f3c5p1c";
        buildDepends = [
          aeson base bytestring email-validate exceptions filepath
          http-client http-client-tls http-types tagsoup text time
@@ -61064,10 +61123,9 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "haskell-coffee";
-       version = "0.1.0.1";
-       sha256 = "0g95vhqga7hq6w6x993d29wpphcqidmm0vzni93blqka7yfc7ybb";
+       version = "0.1.0.2";
+       sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7";
        buildDepends = [ base process ];
-       jailbreak = true;
        description = "Simple CoffeeScript API";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -61286,8 +61344,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-neo4j-client";
-       version = "0.3.1.2";
-       sha256 = "1qb2m6bxpw24ll1r0hyicmddn9plm55ipdgbykd6yrw1cfrm9qz7";
+       version = "0.3.1.3";
+       sha256 = "0ws1mlf97b4xbysgvm4b3h15kfvk1mjdcxmcchl09c04wadaz86s";
        buildDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base mtl network-uri resourcet
@@ -63060,8 +63118,8 @@ self: {
      }:
      mkDerivation {
        pname = "haxr";
-       version = "3000.11.1";
-       sha256 = "07rz03n0v9nflzid0vx5qh5hc7fmlq9c9kkk35slljv7lwmxw0qh";
+       version = "3000.11.1.1";
+       sha256 = "0a4ad0h45a6jv1x19ss0p6krhq040164cvvaivf0zba5q4ifmffh";
        buildDepends = [
          array base base-compat base64-bytestring blaze-builder bytestring
          HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
@@ -63947,8 +64005,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.6.8";
-       sha256 = "0n6x7dbdbfrxn3y6q9vp7x6vqgdc9nb3w85xjmim7agdf088zzh6";
+       version = "0.6.9";
+       sha256 = "0yciwxsnqc8d09356fisfb44nbzsnvi01aad86gbx4vhrdnw7n7a";
        buildDepends = [
          attoparsec base BoundedChan bytestring bytestring-lexing mtl
          network resource-pool time vector
@@ -64100,14 +64158,15 @@ self: {
      mkDerivation {
        pname = "heist";
        version = "0.14.1.1";
+       revision = "1";
        sha256 = "0hwf8d20lw4gn5mal8iqd62npr2859541h3md451hjlbwpjyqd19";
+       editedCabalFile = "51f2aa86d7582ba504e26ead511da54db5350cf4bed7f13252c678c0cf19d400";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist either filepath hashable
          map-syntax MonadCatchIO-transformers mtl process random text time
          transformers unordered-containers vector xmlhtml
        ];
-       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
@@ -65411,8 +65470,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchical-clustering";
-       version = "0.4.4";
-       sha256 = "1hm47fccji8dn70477ww7s6846mxrmgr5n056c11dh9azz5jl5x2";
+       version = "0.4.6";
+       sha256 = "1cfcrnxqczqzqgpyipsw9dwfw1j75zd11vpd12i533f3p44pzwbm";
        buildDepends = [ array base containers ];
        testDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
@@ -65426,8 +65485,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchical-clustering-diagrams";
-       version = "0.3";
-       sha256 = "0yq3sh6xn3p1jzp3w33zv1sx7yhv9v2ddcqd27cl3rm6lhph81jc";
+       version = "0.3.2";
+       sha256 = "06ncyzhql74ni746a9hzma1v0grw99vas4xglmyvgd6yhdwl08sr";
        buildDepends = [ base diagrams-lib hierarchical-clustering ];
        testDepends = [
          base diagrams-cairo diagrams-lib hierarchical-clustering hspec
@@ -65518,6 +65577,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "highjson" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, hashable
+     , hspec, hvect, scientific, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "highjson";
+       version = "0.1.0.0";
+       sha256 = "1j0gcbgawimzr8vvglikmdr8q58zvvak68k8221ljydppanc30k0";
+       buildDepends = [
+         attoparsec base bytestring containers hashable hvect scientific
+         text unordered-containers vector
+       ];
+       testDepends = [ base hspec text ];
+       homepage = "https://github.com/agrafix/highjson";
+       description = "Very fast JSON parsing";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "highlight-versions" = callPackage
     ({ mkDerivation, ansi-terminal, base, Cabal, containers, hackage-db
      }:
@@ -65850,10 +65927,9 @@ self: {
      }:
      mkDerivation {
        pname = "hint-server";
-       version = "1.4.0";
-       sha256 = "0iirk76n9j4iwll44gs4spnssv2kkxrw4ypp228gap5h4pyimvx5";
+       version = "1.4.1";
+       sha256 = "1b7dzij1c4940m00kbpnmymh6grd54d2xsgsi1d10x22bl7naq7m";
        buildDepends = [ base eprocess exceptions hint monad-loops mtl ];
-       jailbreak = true;
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67233,10 +67309,8 @@ self: {
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.2.0";
-       revision = "1";
-       sha256 = "02aygnc0hhg3gsj9z323pq6i6v9ijjj5r6i8g1zx1cnwd51dw1aj";
-       editedCabalFile = "8267f50b3b3fc9736bb1e942fbe425a1a4ef2b96a6b906dff18496ce1e0578d6";
+       version = "0.2.1";
+       sha256 = "1y10w6ylgrdgy271a372f14rqdkvzlmpkjl08d5zg3r84jxhy6ia";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -70219,26 +70293,31 @@ self: {
 
   "hsdev" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
-     , bytestring, Cabal, containers, deepseq, directory, exceptions
-     , filepath, ghc, ghc-mod, ghc-paths, haddock-api, haskell-src-exts
-     , hdocs, HTTP, lens, monad-loops, mtl, network, process
-     , regex-pcre-builtin, scientific, template-haskell, text, time
-     , transformers, uniplate, unix, unordered-containers, vector
+     , bin-package-db, bytestring, Cabal, containers, deepseq, directory
+     , exceptions, filepath, fsnotify, ghc, ghc-mod, ghc-paths
+     , haddock-api, haskell-src-exts, hdocs, hlint, HTTP, lens
+     , monad-loops, MonadCatchIO-transformers, mtl, network, process
+     , regex-pcre-builtin, scientific, simple-log, system-filepath
+     , template-haskell, text, time, transformers, uniplate, unix
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.3.4";
-       sha256 = "1m21wwl93sba113qr733a9qpxc0ljrn6mpd17760gzxpa5vhfjqd";
+       version = "0.1.4.0";
+       sha256 = "1m7pfrzi23wq7b3bwp4fc885di96gkg453q8xmlwdip37mh2swgz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson aeson-pretty array attoparsec base bytestring Cabal
-         containers deepseq directory exceptions filepath ghc ghc-mod
-         ghc-paths haddock-api haskell-src-exts hdocs HTTP lens monad-loops
-         mtl network process regex-pcre-builtin scientific template-haskell
-         text time transformers uniplate unix unordered-containers vector
+         aeson aeson-pretty array attoparsec base bin-package-db bytestring
+         Cabal containers deepseq directory exceptions filepath fsnotify ghc
+         ghc-mod ghc-paths haddock-api haskell-src-exts hdocs hlint HTTP
+         lens monad-loops MonadCatchIO-transformers mtl network process
+         regex-pcre-builtin scientific simple-log system-filepath
+         template-haskell text time transformers uniplate unix
+         unordered-containers vector
        ];
        testDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
@@ -72471,8 +72550,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.16";
-       sha256 = "1ghz498h3c0n1wfkxgkh9zd8l6yik650505hihnayp4wcykc1p82";
+       version = "0.4.18";
+       sha256 = "0skla9kvlak482fsk21gz57jcwc568x3q62nkanxjn1pgxc1jili";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -72646,8 +72725,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.1.5.1";
-       sha256 = "1rpp830319hqqazf1gh28jh239a67qksmx2ki3p91h9nsa8lh6w2";
+       version = "2.1.7";
+       sha256 = "1qdxd9dbzav7nky8s9ml6ik6i38mxzzg7dwj0pv1sp5prclk0jh1";
        buildDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -73557,12 +73636,12 @@ self: {
     ({ mkDerivation, base, HTF }:
      mkDerivation {
        pname = "hvect";
-       version = "0.1.0.0";
-       sha256 = "12zwrzz0bk83i42q3iv5cs2dma2a80s8zkjyill0ysxyrjni25wy";
+       version = "0.2.0.0";
+       sha256 = "01iarjnwm5syhmf6552g3p9dc05nqc74r4nfmagajgv7fnlsf3ri";
        buildDepends = [ base ];
        testDepends = [ base HTF ];
        homepage = "https://github.com/agrafix/hvect";
-       description = "Simple heterogeneous lists";
+       description = "Simple strict heterogeneous lists";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -74613,7 +74692,9 @@ self: {
      mkDerivation {
        pname = "ib-api";
        version = "0.1.0.0";
+       revision = "1";
        sha256 = "1030bj90myx5x3y297qmlmnzppfnh5d3cmwglqj1s7i6nyrh86k5";
+       editedCabalFile = "7cb1fe96767e6253ef55d4997404eb3f4048f1b9bfccfb9e6cca627a734c3bcd";
        buildDepends = [ attoparsec base bytestring network ];
        jailbreak = true;
        homepage = "https://github.com/rbermani/ib-api";
@@ -75937,8 +76018,8 @@ self: {
      }:
      mkDerivation {
        pname = "inflections";
-       version = "0.1.0.10";
-       sha256 = "0v9iz9q4f5cx2hr0afvbzy5ax71kx1klbjrla14bqdfh55hzdhrp";
+       version = "0.2.0.0";
+       sha256 = "16s2sj2417qmhdlzn7j51yf7fh50f5msgb50fsavw80845602x43";
        buildDepends = [ base containers parsec ];
        testDepends = [
          base containers HUnit parsec QuickCheck test-framework
@@ -76026,6 +76107,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "inilist" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, deepseq, HUnit, safe
+     , tasty, tasty-hunit, testpack, trifecta
+     }:
+     mkDerivation {
+       pname = "inilist";
+       version = "0.1.0.0";
+       sha256 = "18f93kvc5x0y1wqcicrh510r3skldf52jn0n6cxyn7fk2271cc1b";
+       buildDepends = [ base bifunctors containers safe trifecta ];
+       testDepends = [
+         base bifunctors containers deepseq HUnit safe tasty tasty-hunit
+         testpack trifecta
+       ];
+       homepage = "https://chiselapp.com/user/mwm/repository/inilist";
+       description = "Processing for .ini files with duplicate sections and options";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "inject" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, hspec-expectations
      , process, text
@@ -76162,13 +76261,12 @@ self: {
      }:
      mkDerivation {
        pname = "instant-aeson";
-       version = "0.1";
-       sha256 = "1idxwd0wxy6xziwlwnjwgbv9canpvwbnigrcjn3kvl0j7nld6wvj";
+       version = "0.1.0.1";
+       sha256 = "18zxvd4sw13j4gn2f7r2xdy6p0xayjv3ks8j97j7vi6cdw9aqw2z";
        buildDepends = [ aeson base instant-generics ];
        testDepends = [
          aeson base instant-generics tasty tasty-quickcheck
        ];
-       jailbreak = true;
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76179,13 +76277,12 @@ self: {
      }:
      mkDerivation {
        pname = "instant-bytes";
-       version = "0.1";
-       sha256 = "0gjj7ix1dxlbk1im2ww3qpfx4m40vg0hl7n9ribnlx2krw53mmm1";
+       version = "0.1.0.1";
+       sha256 = "1g99yakjychx12amls2b6cfma0fzh0n9w4m2k03wqibk1aagl940";
        buildDepends = [ base bytes instant-generics ];
        testDepends = [
          base bytes instant-generics tasty tasty-quickcheck
        ];
-       jailbreak = true;
        description = "Generic Serial instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76194,10 +76291,9 @@ self: {
     ({ mkDerivation, base, deepseq, instant-generics }:
      mkDerivation {
        pname = "instant-deepseq";
-       version = "0.1";
-       sha256 = "13w4ilnjm6m9idqkxzp0l91f156n097zlhmpny1lamy5brvzpls0";
+       version = "0.1.0.1";
+       sha256 = "1yv5zqv2fqj8b7qzx2004sa287mrvrswmghl13vsbj2whmdh0kjz";
        buildDepends = [ base deepseq instant-generics ];
-       jailbreak = true;
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76219,10 +76315,9 @@ self: {
     ({ mkDerivation, base, hashable, instant-generics }:
      mkDerivation {
        pname = "instant-hashable";
-       version = "0.1";
-       sha256 = "0bqn9na0pxkkffmwwz6p4rgv11fq2mn724sk4l7nxv44k7vrirz2";
+       version = "0.1.0.1";
+       sha256 = "1yaf24r68zh5vsp73747hbv2fdk9y9vgswj6lv22s52s8h6f1agj";
        buildDepends = [ base hashable instant-generics ];
-       jailbreak = true;
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76477,13 +76572,13 @@ self: {
      }:
      mkDerivation {
        pname = "interpolatedstring-perl6";
-       version = "0.9.0";
-       sha256 = "15hzmni3wfdgjl0vyk5mcld61ba99wdax87s7wkz2s8bsyxkbq9n";
+       version = "1.0.0";
+       sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
        buildDepends = [
          base bytestring haskell-src-meta template-haskell text
        ];
        description = "QuasiQuoter for Perl6-style multi-line interpolated strings";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "interpolatedstring-qq" = callPackage
@@ -77115,6 +77210,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "irc-fun-color" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "irc-fun-color";
+       version = "0.1.0.0";
+       sha256 = "1zb3d3m17049g7cfnpnl8c1ldyhhwvxh99dbfx1xzyadg841i08a";
+       buildDepends = [ base ];
+       testDepends = [ base ];
+       homepage = "http://rel4tion.org/projects/irc-fun-color/";
+       description = "Add color and style decorations to IRC messages";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "ircbot" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix
@@ -78432,18 +78540,21 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, hslogger, lens, template-haskell, text
-     , transformers
+    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
+     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.2.0.5";
-       sha256 = "0avl5gvq3sv2fk524hazfk1xgb9rlyqqqrvnxb63psjds7s6rxp1";
-       buildDepends = [ base lens template-haskell text transformers ];
-       testDepends = [
-         base hslogger lens template-haskell text transformers
+       version = "0.2.0.6";
+       sha256 = "1ggnhv9lgsd330p1k6zvg20dbqb1ysh282nalxramqvn2yhmqsx4";
+       buildDepends = [
+         base lens template-haskell text transformers webkitgtk3
+         webkitgtk3-javascriptcore
+       ];
+       testDepends = [
+         base glib gtk3 hslogger lens template-haskell text transformers
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -78747,8 +78858,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-server";
-       version = "0.2.0.0";
-       sha256 = "08v2bvswn0a0jhd0gd83f2lxr0n0nirl9xav7zj3y3bjdkxwlkys";
+       version = "0.2.1.0";
+       sha256 = "1rbm8anj3lg3x7gky5nazxcsdwd5c48b1axphgcqzzy5hn8hsg2r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -80820,15 +80931,14 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacms-core";
-       version = "0.1.0.0";
-       sha256 = "0f34158j493ga5zrl1fxqyxvxfj3gzx77vs3p9rb7syn7c1zxa53";
+       version = "0.3.0.0";
+       sha256 = "069mj7p3996bkl0vyj1bpphb6gs85r234svls9rzg2lgpxfp4gga";
        buildDepends = [
          base blaze-html bytestring containers data-default esqueleto
          file-embed friendly-time gravatar lists mime-mail old-locale
          persistent shakespeare template-haskell text time uuid wai yesod
          yesod-auth yesod-core yesod-form
        ];
-       jailbreak = true;
        homepage = "http://lambdacms.org";
        description = "LambdaCms Core subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
@@ -80841,8 +80951,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacms-media";
-       version = "0.2.0";
-       sha256 = "08c2qdpqv8bw0qkpjk5fcyyqdgpxgp6xivfimai6bh3lxz2yk0gz";
+       version = "0.3.0.1";
+       sha256 = "074bghfbi3m4ffla34z0yq2qgbw3ps81fq2cm8ibqry3bps511xp";
        buildDepends = [
          base directory filepath lambdacms-core persistent shakespeare text
          time yesod yesod-form
@@ -82216,8 +82326,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.1.0";
-       sha256 = "0skvn5n69ir63q91jaj5qdhk8cxvic61g9ar5wck0gwpzdjcfl6w";
+       version = "0.15.1.1";
+       sha256 = "0gjgaigkd34gzfvqhlxqqxcydh12064prnn0x653kb5ks8bq4qml";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -82251,8 +82361,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.4";
-       sha256 = "0zjdzsv9vwhsabkkyf47gfsca4b1yqjgd2vlvb0qm7ca9gymd0ic";
+       version = "0.15.0.6";
+       sha256 = "1pcf42hipc5q3n61pbd2sdgvhshl2ri261i94myb3fc13kbi90hb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -82535,8 +82645,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.2.6";
-       sha256 = "0pn4x75l04qs95h9ca5chvxbivnb29h4d8415n4r2b1gmx4apn0w";
+       version = "0.1.2.7";
+       sha256 = "1g3if2y41li6wyg7ffvpybqvbywiq8bf5b5fb6pz499hinzahb9d";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -83290,14 +83400,13 @@ self: {
      }:
      mkDerivation {
        pname = "libsystemd-journal";
-       version = "1.3.1";
-       sha256 = "1i66w6dhycvi3d0vnws91mc0k9v46qr0zpc35yliv1paipm1s51a";
+       version = "1.3.3";
+       sha256 = "02d1zpmimmisjngkx9l23af51v18pdbc5mh7yljyw81lm39yzvfn";
        buildDepends = [
          base bytestring hashable hsyslog pipes pipes-safe text transformers
          uniplate unix-bytestring unordered-containers uuid vector
        ];
        pkgconfigDepends = [ systemd ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
@@ -83570,8 +83679,8 @@ self: {
      }:
      mkDerivation {
        pname = "limp";
-       version = "0.3.2.0";
-       sha256 = "0shc69jlzmn8b2pxdfav9lk9cbhxpd1cmsr36rwgyvyn5shiijy1";
+       version = "0.3.2.1";
+       sha256 = "0fx8q7ll47qc06laagiap0z4b5mbp958r3b9mc6qm1h9rhksimjk";
        buildDepends = [ base containers ];
        testDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
@@ -83587,8 +83696,8 @@ self: {
     ({ mkDerivation, base, c2hs, containers, limp, vector }:
      mkDerivation {
        pname = "limp-cbc";
-       version = "0.3.2.0";
-       sha256 = "10cm2vwbjyzqpq2ras8viza0vy0r0hgrm84landlcgkbhfj71l79";
+       version = "0.3.2.1";
+       sha256 = "0q4az96nbwvm7jhrwvbjp87vzkb5nlp739jhkya6z0iq340cjxjy";
        buildDepends = [ base containers limp vector ];
        testDepends = [ base limp ];
        buildTools = [ c2hs ];
@@ -83905,13 +84014,12 @@ self: {
      }:
      mkDerivation {
        pname = "linklater";
-       version = "3.1.0.0";
-       sha256 = "0mvmlq1nl428syc013hif07rssvya7wxkr44rs58rjn2zsxhhlqq";
+       version = "3.2.0.0";
+       sha256 = "15c6p63yd1g5if2nz9pig6kc0rvqpjixjs6zr2j9m16q0h6kgrfr";
        buildDepends = [
          aeson base base-prelude bytestring containers http-types text wai
          wreq
        ];
-       jailbreak = true;
        homepage = "https://github.com/hlian/linklater";
        description = "The fast and fun way to write Slack.com bots";
        license = stdenv.lib.licenses.bsd3;
@@ -85698,8 +85806,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.15.0.1";
-       sha256 = "0qw689ip8kibczjvar6bicns6g8a0zwlb6vdcmpicxxmpr1p7g16";
+       version = "0.15.0.2";
+       sha256 = "19wnkl9acibs6kcnm0m02jhjxrn19sanf5z2w0kqwjbqlfcrcc4a";
        buildDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
@@ -90584,8 +90692,8 @@ self: {
      }:
      mkDerivation {
        pname = "monoid-subclasses";
-       version = "0.4.1.1";
-       sha256 = "0r2ypb85qz88jz70pr4rgygwsdslaw781s0d3svd6s7xfibi9hww";
+       version = "0.4.1.2";
+       sha256 = "0j9an1zq3dg02jz8skqkch01kg2ha59zja2729v8lpwxsd4sbi9x";
        buildDepends = [ base bytestring containers primes text vector ];
        testDepends = [
          base bytestring containers primes QuickCheck quickcheck-instances
@@ -91035,6 +91143,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ms" = callPackage
+    ({ mkDerivation, base, contravariant, doctest, edit-distance, lens
+     , profunctors, semigroupoids, semigroups, tasty, tasty-quickcheck
+     , vector
+     }:
+     mkDerivation {
+       pname = "ms";
+       version = "0.2.1";
+       sha256 = "0h70dkgzybbjm48ay9xqbvydf13a6q1zy99ln8kx4qlfdi4gsrnp";
+       buildDepends = [
+         base contravariant edit-distance lens profunctors semigroupoids
+         semigroups vector
+       ];
+       testDepends = [
+         base doctest profunctors tasty tasty-quickcheck vector
+       ];
+       homepage = "https://github.com/relrod/ms";
+       description = "metric spaces";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "msgpack" = callPackage
     ({ mkDerivation, base, binary, blaze-builder, bytestring
      , containers, data-binary-ieee754, deepseq, hashable, mtl
@@ -93479,10 +93608,9 @@ self: {
     ({ mkDerivation, base, netwire }:
      mkDerivation {
        pname = "netwire-input";
-       version = "0.0.3";
-       sha256 = "0c6wi1gfr0pxm8hav6ziic444a83cns3yf07kdylxbymgzgq7n7z";
+       version = "0.0.4";
+       sha256 = "1f0dczgnc1fibq5ypdzi1hgsahmbfmv783bliwh5x4j4vm81k0h6";
        buildDepends = [ base netwire ];
-       jailbreak = true;
        homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
        license = stdenv.lib.licenses.mit;
@@ -93493,12 +93621,11 @@ self: {
      }:
      mkDerivation {
        pname = "netwire-input-glfw";
-       version = "0.0.3";
-       sha256 = "04flihwgs4wibhppyjw7x23s2629rbywafbv9dmdcda6bv6d8qm3";
+       version = "0.0.4";
+       sha256 = "163jd8bb0msy9r51s8qb6ypk25lax46kkbzq9wh2s4kvzribmdlg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers GLFW-b mtl netwire-input stm ];
-       jailbreak = true;
        homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
        description = "GLFW instance of netwire-input";
        license = stdenv.lib.licenses.mit;
@@ -94182,6 +94309,7 @@ self: {
          amqp base network-transport network-transport-tests tasty
          tasty-hunit
        ];
+       jailbreak = true;
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94880,24 +95008,25 @@ self: {
     ({ mkDerivation, base, primitive, vector }:
      mkDerivation {
        pname = "nonlinear-optimization";
-       version = "0.3.7";
-       sha256 = "147dbq19n18ixfz6bhx9yi9ppr9j3wnc5dfz8kx5gwihy64b8l1b";
+       version = "0.3.10";
+       sha256 = "11dq7fvysdb0szkg58f2wmx2vg6sa9qfj9kfv7wv6fl3386dnp7f";
        buildDepends = [ base primitive vector ];
-       jailbreak = true;
        description = "Various iterative algorithms for optimization of nonlinear functions";
        license = "GPL";
      }) {};
 
   "nonlinear-optimization-ad" = callPackage
-    ({ mkDerivation, ad, base, nonlinear-optimization, primitive
+    ({ mkDerivation, ad, base, csv, nonlinear-optimization, primitive
      , reflection, vector
      }:
      mkDerivation {
        pname = "nonlinear-optimization-ad";
-       version = "0.2.0";
-       sha256 = "1aglqfmvjb7wmxlnlkakkp27lbyq62pjy48k18sqppj6q0qp062m";
+       version = "0.2.1";
+       sha256 = "0k3iynppdvmm9asy1wddp8n3gmskh40dmcngqv8pgy5qx0bnx8jd";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
-         ad base nonlinear-optimization primitive reflection vector
+         ad base csv nonlinear-optimization primitive reflection vector
        ];
        homepage = "https://github.com/msakai/nonlinear-optimization-ad";
        description = "Wrapper of nonlinear-optimization package for using with AD package";
@@ -94938,8 +95067,8 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.4.0";
-       sha256 = "11ikk8yia52qbaajcnwc7gq1jwwid12j8vzgn2v18j5d272lzwyc";
+       version = "0.7.5.0";
+       sha256 = "1r0mycb3ilz2k89vab08c1diz18mp03b5sds4ixmxfb0zqaz68lb";
        buildDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
@@ -95426,6 +95555,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nvim-hs" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+     , conduit-extra, containers, data-default, directory, dyre
+     , filepath, hslogger, hspec, hspec-discover, HUnit, lifted-base
+     , messagepack, monad-control, mtl, network, optparse-applicative
+     , parsec, process, QuickCheck, resourcet, stm, streaming-commons
+     , template-haskell, text, time, transformers, transformers-base
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "nvim-hs";
+       version = "0.0.1";
+       sha256 = "1zma19lb4kzzfiabkx55ffgvdqrycijpm2yz3jszm1m6m58khif5";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra
+         containers data-default directory dyre filepath hslogger
+         lifted-base messagepack monad-control mtl network
+         optparse-applicative parsec process resourcet stm streaming-commons
+         template-haskell text time transformers transformers-base
+         utf8-string
+       ];
+       testDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra
+         containers data-default directory dyre filepath hslogger hspec
+         hspec-discover HUnit lifted-base messagepack mtl network
+         optparse-applicative parsec process QuickCheck resourcet stm
+         streaming-commons template-haskell text time transformers
+         utf8-string
+       ];
+       homepage = "https://github.com/saep/nvim-hs";
+       description = "Haskell plugin backend for neovim";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "nyan" = callPackage
     ({ mkDerivation, base, bytestring, mtl, ncurses, text }:
      mkDerivation {
@@ -99227,6 +99392,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persist2er" = callPackage
+    ({ mkDerivation, base, optparse-applicative, persistent, text }:
+     mkDerivation {
+       pname = "persist2er";
+       version = "0.1.0.1";
+       sha256 = "096gjkmw06crywwwydyr67447xmp8x967dwh1gavlr0061skb72p";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base optparse-applicative persistent text ];
+       jailbreak = true;
+       description = "Transforms persist's quasi-quoted syntax into ER format";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "persistable-record" = callPackage
     ({ mkDerivation, array, base, containers, dlist, names-th
      , template-haskell, transformers
@@ -100339,6 +100518,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-cereal" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, mtl, pipes
+     , pipes-bytestring, pipes-parse
+     }:
+     mkDerivation {
+       pname = "pipes-cereal";
+       version = "0.1.0.0";
+       sha256 = "04f538gyzvwxhqscsj9sywi6hz5k1fabjaga0vf861hlmv9agaa8";
+       buildDepends = [
+         base bytestring cereal mtl pipes pipes-bytestring pipes-parse
+       ];
+       description = "Encode and decode binary streams using the pipes and cereal libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-cereal-plus" = callPackage
     ({ mkDerivation, base, bytestring, cereal-plus, errors, mtl, pipes
      , pipes-bytestring, text
@@ -104715,6 +104909,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pusher-haskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, MissingH
+     , mtl, SHA, time
+     }:
+     mkDerivation {
+       pname = "pusher-haskell";
+       version = "0.1.0.0";
+       sha256 = "0ymj27a3kmaddydd5zshj108fmzhlxasn9i4igzjaj308f1ygki6";
+       buildDepends = [
+         aeson base bytestring HTTP MissingH mtl SHA time
+       ];
+       testDepends = [ base hspec ];
+       jailbreak = true;
+       homepage = "http://www.github.com/sidraval/pusher-haskell";
+       description = "A Pusher.com client written in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pushme" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hslogger, io-storage, lens, old-locale, optparse-applicative
@@ -106051,16 +106263,16 @@ self: {
      }) {};
 
   "range" = callPackage
-    ({ mkDerivation, base, Cabal, parsec, QuickCheck, random
+    ({ mkDerivation, base, Cabal, free, parsec, QuickCheck, random
      , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "range";
-       version = "0.1.1.1";
-       sha256 = "05xcy4r97yyqr72cqpr5rq514zygbwa2hfnhilvgzrh3cmk61n0p";
-       buildDepends = [ base parsec ];
+       version = "0.1.2.0";
+       sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab";
+       buildDepends = [ base free parsec ];
        testDepends = [
-         base Cabal QuickCheck random test-framework
+         base Cabal free QuickCheck random test-framework
          test-framework-quickcheck2
        ];
        homepage = "https://bitbucket.org/robertmassaioli/range";
@@ -106333,8 +106545,8 @@ self: {
      }:
      mkDerivation {
        pname = "rdf4h";
-       version = "1.3.1";
-       sha256 = "0mcswyjlvhnv4rvapanfmxf2brsp5b9r1ps22n3rlhpa3mfw72rc";
+       version = "1.3.2";
+       sha256 = "09ya3d1svg6fj7jdm408gisv0cnn0c2i2c3pn07xggnn882s93bw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -106343,9 +106555,9 @@ self: {
          unordered-containers
        ];
        testDepends = [
-         base bytestring containers deepseq fgl hashable HTTP HUnit hxt knob
-         network network-uri parsec QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 text
+         base binary bytestring containers deepseq fgl hashable HTTP HUnit
+         hxt knob network network-uri parsec QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text text-binary
          unordered-containers
        ];
        homepage = "https://github.com/robstewart57/rdf4h";
@@ -106411,15 +106623,16 @@ self: {
      }) {};
 
   "react-haskell" = callPackage
-    ({ mkDerivation, base, deepseq, haste-compiler, lens-family
-     , monads-tf, transformers, void
+    ({ mkDerivation, aeson, base, deepseq, lens-family, monads-tf, text
+     , transformers, unordered-containers, void
      }:
      mkDerivation {
        pname = "react-haskell";
-       version = "1.3.0.0";
-       sha256 = "1jq96fiq133ng6ayknzxwcz59f2gxa5f5hhj9n46pixwdp6bf2aa";
+       version = "2.0.0";
+       sha256 = "016bpbci89b6grkwnq1yqjm5y50di1hmjlf2mkxjc0wyi82c7say";
        buildDepends = [
-         base deepseq haste-compiler lens-family monads-tf transformers void
+         aeson base deepseq lens-family monads-tf text transformers
+         unordered-containers void
        ];
        homepage = "https://github.com/joelburget/react-haskell";
        description = "Haskell React bindings";
@@ -106955,6 +107168,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reddit" = callPackage
+    ({ mkDerivation, aeson, api-builder, base, bytestring, Cabal
+     , data-default, hspec, http-conduit, http-types, network, stm, text
+     , time, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "reddit";
+       version = "0.1.0.0";
+       revision = "1";
+       sha256 = "1g18lfl9hvz13f3i5h819pfh724i5lhgqfvyy2r06ni7hjfylzj4";
+       editedCabalFile = "84c6e65809dcd5c4fed83d64c71c6465a6ee1fe6e913c637dc2db608c6cc5870";
+       buildDepends = [
+         aeson api-builder base bytestring data-default http-conduit
+         http-types network stm text time transformers unordered-containers
+         vector
+       ];
+       testDepends = [
+         api-builder base bytestring Cabal hspec http-conduit text time
+         transformers
+       ];
+       homepage = "https://github.com/intolerable/reddit";
+       description = "Library for interfacing with Reddit's API";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "redis" = callPackage
     ({ mkDerivation, base, bytestring, concurrent-extra, containers
      , exceptions, mtl, network, old-time, utf8-string
@@ -107150,6 +107388,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "refact" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "refact";
+       version = "0.2.0.0";
+       sha256 = "1ixbji328bxdz4rblb0s7hp6vbckj4yj03a8a8sa756igj988v8f";
+       buildDepends = [ base ];
+       description = "Specify refactorings to perform with apply-refact";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "refcount" = callPackage
     ({ mkDerivation, base, Cabal, hashable, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -111341,15 +111590,16 @@ self: {
 
   "satchmo" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
-     , directory, minisat, mtl, process
+     , deepseq, directory, hashable, lens, memoize, minisat, mtl
+     , process, transformers
      }:
      mkDerivation {
        pname = "satchmo";
-       version = "2.9.7.3";
-       sha256 = "1gkb3whi0sv51jxb3x4dpam532fv3wbn1dyp9sc2c7mdjnv24kn8";
+       version = "2.9.9";
+       sha256 = "134i2xd7fvdhx43a51486mb3szi6c604pqc6w3cxsic1ngm30jbw";
        buildDepends = [
-         array async base bytestring containers directory minisat mtl
-         process
+         array async base bytestring containers deepseq directory hashable
+         lens memoize minisat mtl process transformers
        ];
        testDepends = [ array base ];
        homepage = "https://github.com/jwaldmann/satchmo";
@@ -114358,8 +114608,8 @@ self: {
      }:
      mkDerivation {
        pname = "shared-fields";
-       version = "0.1.0.0";
-       sha256 = "178jpksnxmyc07nc49wdalyh63bxwshddif9fb48p1fzcy2z5aph";
+       version = "0.2.0.0";
+       sha256 = "107n6w4dn0n4iv7qmfm1d9y04rgj3ab3qc8kyqqddnbnfa44y157";
        buildDepends = [ base template-haskell ];
        testDepends = [ base Cabal hspec lens text ];
        homepage = "http://github.com/intolerable/shared-fields";
@@ -114531,8 +114781,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.2.5";
-       sha256 = "1dvaf1w1b5y717n24b9c3ri1qnpqppk5syh834h4iqcwfwlkjcvy";
+       version = "1.6.3";
+       sha256 = "1j9sv0dzhxkqml9v3r9nbwkpnjz1jhn09mlxlrjfakjmf3i9b9vp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -114857,14 +115107,14 @@ self: {
      }) {};
 
   "silently" = callPackage
-    ({ mkDerivation, base, deepseq, directory, nanospec }:
+    ({ mkDerivation, base, deepseq, directory, nanospec, temporary }:
      mkDerivation {
        pname = "silently";
-       version = "1.2.4.1";
-       sha256 = "035dw3zg680ykyz5rqkkrjn51wkznbc4jb45a8l2gh3vgqzgbf52";
+       version = "1.2.5";
+       sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf";
        buildDepends = [ base deepseq directory ];
-       testDepends = [ base deepseq directory nanospec ];
-       homepage = "https://github.com/trystan/silently";
+       testDepends = [ base deepseq directory nanospec temporary ];
+       homepage = "https://github.com/hspec/silently";
        description = "Prevent or capture writing to stdout and other handles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116450,7 +116700,7 @@ self: {
   "snap" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , clientsession, comonad, configurator, containers, directory
-     , directory-tree, dlist, errors, filepath, hashable, heist, lens
+     , directory-tree, dlist, either, filepath, hashable, heist, lens
      , logict, MonadCatchIO-transformers, mtl, mwc-random, old-time
      , pwstore-fast, regex-posix, snap-core, snap-server, stm
      , template-haskell, text, time, transformers, unordered-containers
@@ -116458,19 +116708,18 @@ self: {
      }:
      mkDerivation {
        pname = "snap";
-       version = "0.14.0.5";
-       sha256 = "0wifww6mry2lxj572j9gwjxpjz4z7z9hd9jzhfyfwv2c67b39iyr";
+       version = "0.14.0.6";
+       sha256 = "05xnil6kfxwrnbvg7sigzh7hl8jsfr8cvbjd41z9ywn6ymxzr7zs";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson attoparsec base bytestring cereal clientsession comonad
-         configurator containers directory directory-tree dlist errors
+         configurator containers directory directory-tree dlist either
          filepath hashable heist lens logict MonadCatchIO-transformers mtl
          mwc-random old-time pwstore-fast regex-posix snap-core snap-server
          stm template-haskell text time transformers unordered-containers
          vector vector-algorithms xmlhtml
        ];
-       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -116572,7 +116821,9 @@ self: {
      mkDerivation {
        pname = "snap-core";
        version = "0.9.7.2";
+       revision = "1";
        sha256 = "0lgnflwcjyiinrm75dy1flr37bvjn3yljx53cvlsb3ccfnxqwsjj";
+       editedCabalFile = "d39520edcc970d9d1f683af9631ccbcad39536b9f88040b93efb66cbe7aefc55";
        buildDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring bytestring-mmap
@@ -118275,6 +118526,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "spanout" = callPackage
+    ({ mkDerivation, base, containers, gloss, lens, linear, MonadRandom
+     , mtl, netwire
+     }:
+     mkDerivation {
+       pname = "spanout";
+       version = "0.1";
+       sha256 = "0qi1pm46fyrn4vv1b5kcwhd8im59nz5qil6z33r8wq16vv151qb4";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base containers gloss lens linear MonadRandom mtl netwire
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/vtan/spanout";
+       description = "A breakout clone written in netwire and gloss";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sparse" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , deepseq, directory, doctest, filepath, hlint, hybrid-vectors
@@ -118376,12 +118646,14 @@ self: {
      }) {};
 
   "spatial-math" = callPackage
-    ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }:
+    ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens
+     , linear
+     }:
      mkDerivation {
        pname = "spatial-math";
-       version = "0.2.3.0";
-       sha256 = "0170v4wjdpwf5s1bil9jj6magaa3fv05zz8b6zd4s6ca8cgw4lc4";
-       buildDepends = [ base binary cereal ghc-prim linear ];
+       version = "0.2.4.0";
+       sha256 = "0aysc8r9ry7ii76d6522ja4pjwrfl3m212mbrimbdrh20ykirjvv";
+       buildDepends = [ base binary cereal ghc-prim lens linear ];
        testDepends = [ base doctest ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
        license = stdenv.lib.licenses.bsd3;
@@ -119606,8 +119878,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.9.0";
-       sha256 = "1mp05hv45nfysc43mdcjlhgpwkks4h533m5xf9h86xc1pmc563xf";
+       version = "0.10.0";
+       sha256 = "0dlsgm9bbib45591m7kj9vai48r4n0zvkwm4vd4c78rj54qhnq9n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -119728,8 +120000,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-types";
-       version = "1.0.1.1";
-       sha256 = "0zffk8rc611nm5zl53fynz8ly4mzrqx9cjyfwrw07j9mdwi21dsz";
+       version = "1.1.0";
+       sha256 = "0ynfnkpzvgd54x294w4ga8nyg8lrmcwg3bhlwdlxs2fcffaazi81";
        buildDepends = [
          aeson base Cabal containers exceptions hashable safe semigroups
          text time unordered-containers vector
@@ -120075,12 +120347,11 @@ self: {
      }:
      mkDerivation {
        pname = "statistics-dirichlet";
-       version = "0.6.1";
-       sha256 = "1kd9s7m2a8awqiqbsj0z3w585bq236fmj5s5sadsdd698irkkib1";
+       version = "0.6.3";
+       sha256 = "1sx7hxv5gvzr270h4lb76dihcqcqwgdm6mq2394s407iipb2clbw";
        buildDepends = [
          base deepseq hmatrix-special nonlinear-optimization vector
        ];
-       jailbreak = true;
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120337,8 +120608,8 @@ self: {
      }:
      mkDerivation {
        pname = "stitch";
-       version = "0.3.0.0";
-       sha256 = "0h0n6xyi4fi7jcy2j0yzspfla65zmv3c54d88xynv6sw305rd1kz";
+       version = "0.3.2.0";
+       sha256 = "1h8n7ry8wmzvz4bjfg6vsd7ssy17y54h2pzgjdlfam8yfcly2bb7";
        buildDepends = [ base containers text transformers ];
        testDepends = [ base Cabal hspec text ];
        description = "lightweight CSS DSL";
@@ -120646,8 +120917,8 @@ self: {
      }:
      mkDerivation {
        pname = "stomp-queue";
-       version = "0.2.0";
-       sha256 = "0xd9sdyjasp8ncb5qyzkx77a3wrybcajxdpvndx0viykma6bfmqr";
+       version = "0.2.2";
+       sha256 = "1kymwwj7yjdsyykqdqcnvgphbb1ypx7hi5a2wvx1wzv53lrspa9c";
        buildDepends = [
          attoparsec base bytestring conduit conduit-extra mime mtl
          network-conduit-tls split stompl time utf8-string
@@ -124105,6 +124376,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "telegram" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default
+     , http-conduit, url, utf8-string
+     }:
+     mkDerivation {
+       pname = "telegram";
+       version = "0.1.0.0";
+       sha256 = "1ci6606fx5cisb9yrjh0mkd549w2j3h1vzj3zm2zsl9gr7agvh4n";
+       buildDepends = [
+         aeson base bytestring data-default http-conduit url utf8-string
+       ];
+       description = "Telegram API client";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "tellbot" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, containers, errors
      , http-conduit, mtl, network, regex-posix, split, tagsoup, text
@@ -125485,8 +125771,8 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "text-zipper";
-       version = "0.1.1";
-       sha256 = "0g8w7kyvqmjx4psj0cicv4bxn1ngx0giqyz8fyfhdr6v8wd9r410";
+       version = "0.2.1";
+       sha256 = "1a4kzn2s0ah1sizbdj6fks8zb4wmsx8cqjml4id9xj94zp4akq2r";
        buildDepends = [ base text ];
        description = "A text editor zipper library";
        license = stdenv.lib.licenses.bsd3;
@@ -127647,13 +127933,12 @@ self: {
      }) {};
 
   "total" = callPackage
-    ({ mkDerivation, base, ghc-prim, void }:
+    ({ mkDerivation, base, void }:
      mkDerivation {
        pname = "total";
-       version = "1.0.3";
-       sha256 = "1aqpjpxg4incb03zryp6j66fn9wq1jd7nr5kjvrad8awk7349ggn";
-       buildDepends = [ base ghc-prim void ];
-       jailbreak = true;
+       version = "1.0.4";
+       sha256 = "0zl02pznpgg719d2639491cy4df2amj7rmwfdy9dz9cksm029pga";
+       buildDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128470,8 +128755,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.4.0.2";
-       sha256 = "0avn7011868nqibmdz07s27d8g46v9hwps5h04dg57vk9305j70g";
+       version = "1.4.0.3";
+       sha256 = "0mypgqgqaf2c74vka1pmqzrvz1kwl8pjm1llh4bflizfzrxq3s9d";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -128651,6 +128936,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turkish-deasciifier" = callPackage
+    ({ mkDerivation, base, containers, HUnit, vector }:
+     mkDerivation {
+       pname = "turkish-deasciifier";
+       version = "0.1.0.0";
+       sha256 = "0dk63dknwxi7v67jn9b747mkyiz2af4b76a9q1ynn16xva2qsh93";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base containers vector ];
+       testDepends = [ base HUnit ];
+       homepage = "http://github.com/joom/turkish-deasciifier.hs";
+       description = "Haskell port of Deniz Yuret's Turkish deasciifier";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "turni" = callPackage
     ({ mkDerivation, base, containers, MonadRandom, random }:
      mkDerivation {
@@ -129017,10 +129317,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-conduit";
-       version = "0.1.0";
-       revision = "2";
-       sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji";
-       editedCabalFile = "e70397da5f43d657c6c3bef7419810f61675e78aa0b0da688b1f5939d1e11bf8";
+       version = "0.1.1";
+       sha256 = "0rair336wjgg5pd0vh3g3nlc64f5sw2sg60jj2sjaxv296jvr3xx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -129037,7 +129335,6 @@ self: {
          template-haskell text time transformers transformers-base
          twitter-types twitter-types-lens
        ];
-       jailbreak = true;
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
@@ -129072,8 +129369,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.1.1.5";
-       sha256 = "1205s5a7x8vnv09717x6a2dv7y8rvzcxmmh6hm4cyph6b5p485vz";
+       version = "0.2.0.1";
+       sha256 = "19j10mbvmmdni136b0sdyr0isdhslxcvgabvdqrd3if6cizpmndn";
        buildDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -133646,8 +133943,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-static";
-       version = "3.1.0.1";
-       sha256 = "1z542ivy5x4qj9kizkbbvhz5pn54rcxrs6cc52199khxkfc07gdm";
+       version = "3.1.1";
+       sha256 = "0aiywk7a25fpk9fwm6fmibi4zvg5kynnjs6syfxyzfw4hl1dazjv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -133759,8 +134056,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.8.2";
-       sha256 = "0j6yvwzw1mpamx0phplgang4gcjv25dhqvngfmzmh5fk76npmxr9";
+       version = "3.0.9";
+       sha256 = "19rnkqg4x6n2w2313naxbkcp2hyj4bj6d6kx3rwakk8wmdy70r04";
        buildDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -136213,8 +136510,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordpass";
-       version = "1.0.0.3";
-       sha256 = "1nbgzrc3g3kcc8462sqskdywk0n1m54810r0jsw8ip2xllvkxx9b";
+       version = "1.0.0.4";
+       sha256 = "0plyggai2mq38bmmgc92gd0n3q4dlsywh44yflradg50aslqw0vv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -136938,8 +137235,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.3.2";
-       sha256 = "0njsflaxz2l01vbwndsmqmq37i6nl4cfczy776jdpnv7043b1ynv";
+       version = "0.3.4";
+       sha256 = "03z31c5gnybpfvh3idqimnz90pzbijhrqa8hlikryab148gp1gzn";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -138532,15 +138829,15 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring
-     , conduit, containers, directory, enclosed-exceptions, filepath
-     , hspec, hspec-expectations, HUnit, resourcet, scientific, text
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, enclosed-exceptions
+     , filepath, hspec, HUnit, mockery, resourcet, scientific, text
      , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.11";
-       sha256 = "18ara96wca3gnk436i8rarb5smv80aa3ww4lnlrd5w01rp0p171v";
+       version = "0.8.12";
+       sha256 = "0nmpc1n80sv2bjqhzq5jdhd0zxzz9vka31y7k54fmdwr2jbg879i";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -138549,9 +138846,8 @@ self: {
          unordered-containers vector
        ];
        testDepends = [
-         aeson aeson-qq base bytestring conduit directory hspec
-         hspec-expectations HUnit resourcet text transformers
-         unordered-containers vector
+         aeson aeson-qq base base-compat bytestring conduit hspec HUnit
+         mockery resourcet text transformers unordered-containers vector
        ];
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
@@ -139274,8 +139570,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.11";
-       sha256 = "0n9ssbg7iggrgmxn3hb8niqic2rf453a4fqp0g9xx1rz6p323dv2";
+       version = "1.4.12";
+       sha256 = "12rvzds8ww2szq7r6pyc9kf287v2i5q8n318wy4x4jr3xhw0szy7";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -139717,6 +140013,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-media-simple" = callPackage
+    ({ mkDerivation, base, bytestring, diagrams-cairo, diagrams-core
+     , diagrams-lib, directory, JuicyPixels, vector, yesod
+     }:
+     mkDerivation {
+       pname = "yesod-media-simple";
+       version = "0.1.0.1";
+       sha256 = "1ajlrqsq7x83vc67xqb4r3328akwjp0a0vwf7nvqj3bsjqg5af76";
+       buildDepends = [
+         base bytestring diagrams-cairo diagrams-core diagrams-lib directory
+         JuicyPixels vector yesod
+       ];
+       homepage = "https://github.com/mgsloan/yesod-media-simple";
+       description = "Simple display of media types, served by yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-newsfeed" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, shakespeare, text, time, xml-conduit, yesod-core
@@ -139998,6 +140311,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-routes-flow" = callPackage
+    ({ mkDerivation, attoparsec, base, classy-prelude, system-fileio
+     , text, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-routes-flow";
+       version = "1.0";
+       sha256 = "1bb0w1910mnzci4mi6r2zxhjy4wsridi5h2g97nqhd65qncq4km0";
+       buildDepends = [
+         attoparsec base classy-prelude system-fileio text yesod-core
+       ];
+       homepage = "https://github.com/frontrowed/yesod-routes-flow";
+       description = "Generate Flow routes for Yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-routes-typescript" = callPackage
     ({ mkDerivation, attoparsec, base, classy-prelude, system-fileio
      , text, yesod-core, yesod-routes
@@ -140276,21 +140605,23 @@ self: {
      }) {};
 
   "yesod-transloadit" = callPackage
-    ({ mkDerivation, aeson, base, byteable, bytestring, cryptohash
-     , hspec, lens, lens-aeson, old-locale, shakespeare, text, time
-     , transformers, yesod, yesod-core, yesod-form, yesod-test
+    ({ mkDerivation, aeson, base, byteable, bytestring, containers
+     , cryptohash, hspec, lens, lens-aeson, old-locale, shakespeare
+     , text, time, transformers, unordered-containers, yesod, yesod-core
+     , yesod-form, yesod-test
      }:
      mkDerivation {
        pname = "yesod-transloadit";
-       version = "0.2.1.0";
-       sha256 = "1x4sbjzlx5kxwcsywb90milk5s7shgggsqjsq7zrys28w079y00k";
+       version = "0.3.0.0";
+       sha256 = "0p2npza0clflh1vswyjr4gxx5fxggzv1x61x7c7d79jadq88bi4m";
        buildDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
-         old-locale shakespeare text time transformers yesod yesod-core
-         yesod-form
+         old-locale shakespeare text time transformers unordered-containers
+         yesod yesod-core yesod-form
        ];
        testDepends = [
-         base hspec old-locale text time yesod yesod-form yesod-test
+         aeson base containers hspec lens old-locale text time yesod
+         yesod-form yesod-test
        ];
        description = "Transloadit support for Yesod";
        license = stdenv.lib.licenses.mit;
@@ -140318,16 +140649,17 @@ self: {
      }) {};
 
   "yesod-websockets" = callPackage
-    ({ mkDerivation, async, base, conduit, monad-control, transformers
-     , wai, wai-websockets, websockets, yesod-core
+    ({ mkDerivation, async, base, conduit, enclosed-exceptions
+     , monad-control, transformers, wai, wai-websockets, websockets
+     , yesod-core
      }:
      mkDerivation {
        pname = "yesod-websockets";
-       version = "0.2.1.1";
-       sha256 = "0ksmyag5h5i78jb7bdvsvq0wkyb82k8i4y5d2m6czvhf3i1zw6da";
+       version = "0.2.2";
+       sha256 = "1qs7rxf9maa6mgyhqqkbbcg1ab55xkixpyn3216bhbbwq730kfp5";
        buildDepends = [
-         async base conduit monad-control transformers wai wai-websockets
-         websockets yesod-core
+         async base conduit enclosed-exceptions monad-control transformers
+         wai wai-websockets websockets yesod-core
        ];
        homepage = "https://github.com/yesodweb/yesod";
        description = "WebSockets support for Yesod";
@@ -140902,8 +141234,8 @@ self: {
      }:
      mkDerivation {
        pname = "z3";
-       version = "4.0.0";
-       sha256 = "1axn3kzy6hsrnq5mcgf2n1sv63q3pqkhznvvhlj13k6jc3h2jzhl";
+       version = "4.1.0";
+       sha256 = "1vpmwizxcab1mlz7vp3hp72ddla7805jn0lq60fmkjgmj95ryvq9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers mtl ];

From 44513ae0252961f637219e650c41f5f7b3b54374 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 15:11:04 +0200
Subject: [PATCH 072/123] haskell-inilist: test suite cannot be built because
 it depends on broken testpack

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0ec01cebf49..131ee6a793c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -825,6 +825,7 @@ self: super: {
 
   # Won't compile with recent versions of QuickCheck.
   testpack = markBroken super.testpack;
+  inilist = dontCheck super.inilist;
   MissingH = dontCheck super.MissingH;
 
   # Obsolete for GHC versions after GHC 6.10.x.

From 74bc5a2240ace50145ca6433b5d623ed56038843 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 22 Jul 2015 19:43:01 +0200
Subject: [PATCH 073/123] haskell-shelly: disable test suite to fix the build

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 131ee6a793c..72faf888486 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -894,4 +894,8 @@ self: super: {
 
   # https://ghc.haskell.org/trac/ghc/ticket/9825
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
+
+  # https://github.com/yesodweb/Shelly.hs/issues/105
+  shelly = dontCheck super.shelly;
+
 }

From 9944d92dffef9e0d193d91260a44e6e39b99b411 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 20 Jun 2015 16:23:50 +0300
Subject: [PATCH 074/123] omniorb: add the expression

---
 pkgs/development/tools/omniorb/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/tools/omniorb/default.nix

diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
new file mode 100644
index 00000000000..180e714b81e
--- /dev/null
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, python }:
+stdenv.mkDerivation rec {
+
+  name = "omniorb-${version}";
+
+  version = "4.2.0";
+
+  src = fetchurl rec {
+    url = "http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
+    sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl";
+  };
+
+  buildInputs = [ python ];
+
+  meta = with stdenv.lib; {
+    description = "omniORB is a robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant.";
+    homepage    = "http://omniorb.sourceforge.net/";
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ smironov ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81700f14669..6680cf8233b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5630,6 +5630,8 @@ let
   omake = callPackage ../development/tools/ocaml/omake { };
   omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
 
+  omniorb = callPackage ../development/tools/omniorb { };
+
   opengrok = callPackage ../development/tools/misc/opengrok { };
 
   openocd = callPackage ../development/tools/misc/openocd { };

From dcdd7a37f67d3018d5704e5d10fa4f5e083474f2 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 20 Jun 2015 16:30:03 +0300
Subject: [PATCH 075/123] lp_solve: add the expression

---
 .../science/math/lp_solve/default.nix         | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/science/math/lp_solve/default.nix

diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
new file mode 100644
index 00000000000..09af2d708c9
--- /dev/null
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+
+  name = "lp_solve-${version}";
+  version = "5.5.2.0";
+
+  src = fetchurl {
+    url = "http://sourceforge.net/projects/lpsolve/files/lpsolve/${version}/lp_solve_${version}_source.tar.gz";
+    sha256 = "176c7f023mb6b8bfmv4rfqnrlw88lsg422ca74zjh19i2h5s69sq";
+  };
+
+  buildCommand = ''
+    . $stdenv/setup
+    tar xvfz $src
+    (
+    cd lp_solve*/lpsolve55
+    bash ccc
+    mkdir -pv $out/lib
+    cp -v bin/*/* $out/lib
+    )
+    (
+    cd lp_solve*/lp_solve
+    bash ccc
+    mkdir -pv $out/bin
+    cp -v bin/*/* $out/bin
+    )
+    (
+    mkdir -pv $out/include
+    cp -v lp_solve*/*.h $out/include
+    )
+  '';
+
+  meta = with stdenv.lib; {
+    description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver.";
+    homepage    = "http://lpsolve.sourceforge.net";
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ smironov ];
+    platforms   = platforms.unix;
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6680cf8233b..0aad3947f0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1497,6 +1497,8 @@ let
 
   libbladeRF = callPackage ../development/libraries/libbladeRF { };
 
+  lp_solve = callPackage ../applications/science/math/lp_solve { };
+
   lprof = callPackage ../tools/graphics/lprof { };
 
   fdk_aac = callPackage ../development/libraries/fdk-aac { };

From 9bb0fee487f639671768bbaa2412cd9c8956c493 Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Sat, 20 Jun 2015 21:45:37 +0300
Subject: [PATCH 076/123] openmodelica: add expression

openmodelica.nix: add git to the list of dependencies

openmodelica: generate library sourcelist with hashes

openmodelica: generate library sources (part 2)

openmodelica: fix fakegit

openmodelica: fix libraries issues

openmodelica: add GTK

openmodelica: successful build
---
 .../science/misc/openmodelica/default.nix     | 42 ++++++++++
 .../science/misc/openmodelica/fakegit.nix     | 81 +++++++++++++++++++
 .../misc/openmodelica/src-libs-git.nix        | 71 ++++++++++++++++
 .../misc/openmodelica/src-libs-svn.nix        |  5 ++
 .../science/misc/openmodelica/src-main.nix    |  6 ++
 .../misc/openmodelica/update-src-libs-git.sh  | 64 +++++++++++++++
 .../misc/openmodelica/update-src-libs-svn.sh  | 50 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 8 files changed, 321 insertions(+)
 create mode 100644 pkgs/applications/science/misc/openmodelica/default.nix
 create mode 100644 pkgs/applications/science/misc/openmodelica/fakegit.nix
 create mode 100644 pkgs/applications/science/misc/openmodelica/src-libs-git.nix
 create mode 100644 pkgs/applications/science/misc/openmodelica/src-libs-svn.nix
 create mode 100644 pkgs/applications/science/misc/openmodelica/src-main.nix
 create mode 100755 pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh
 create mode 100755 pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh

diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix
new file mode 100644
index 00000000000..8420d445e09
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/default.nix
@@ -0,0 +1,42 @@
+{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
+hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,
+lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
+doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk }:
+
+let
+
+  fakegit = import ./fakegit.nix {inherit stdenv fetchgit fetchsvn bash;} ;
+
+in
+
+stdenv.mkDerivation {
+  name = "openmodelica";
+
+  src = fetchgit (import ./src-main.nix);
+
+  buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
+    hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which
+    lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
+    doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu
+    git gtk];
+
+  patchPhase = ''
+    cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh
+    cp -fv ${fakegit}/bin/checkout-svn.sh libraries/checkout-svn.sh
+  '';
+
+  configurePhase = ''
+    autoconf
+    ./configure CC=${clang}/bin/clang CXX=${clang}/bin/clang++ --prefix=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "OpenModelica is an open-source Modelica-based modeling and simulation environment";
+    homepage    = "https://openmodelica.org";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ smironov ];
+    platforms   = platforms.linux;
+  };
+}
+
+
diff --git a/pkgs/applications/science/misc/openmodelica/fakegit.nix b/pkgs/applications/science/misc/openmodelica/fakegit.nix
new file mode 100644
index 00000000000..de69626cd3e
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/fakegit.nix
@@ -0,0 +1,81 @@
+{stdenv, fetchgit, fetchsvn, bash } :
+
+let
+  mkscript = path : text : ''
+    mkdir -pv `dirname ${path}`
+    cat > ${path} <<"EOF"
+    #!${bash}/bin/bash
+    ME=`basename ${path}`
+    ${text}
+    EOF
+    sed -i "s@%out@$out@g" ${path}
+    chmod +x ${path}
+  '';
+  
+  hashname = r: let
+    rpl = stdenv.lib.replaceChars [":" "/"] ["_" "_"];
+  in
+    (rpl r.url) + "-" + (rpl r.rev);
+
+in
+
+stdenv.mkDerivation {
+  name = "fakegit";
+
+  buildCommand = ''
+    mkdir -pv $out/repos
+    ${stdenv.lib.concatMapStrings
+       (r : ''
+        cp -r ${fetchgit r} $out/repos/${hashname r}
+       ''
+       ) (import ./src-libs-git.nix)
+    }
+
+    ${mkscript "$out/bin/checkout-git.sh" ''
+      if test "$#" -ne 4; then
+        echo "Usage: $0 DESTINATION URL GITBRANCH HASH"
+        exit 1
+      fi
+      DEST=$1
+      URL=`echo $2 | tr :/ __`
+      GITBRANCH=$3
+      REVISION=$4
+
+      L=`echo $REVISION | wc -c`
+      if expr $L '<' 10 >/dev/null; then
+        REVISION=refs/tags/$REVISION
+      fi
+
+      REVISION=`echo $REVISION | tr :/ __`
+
+      rm -rf $DEST
+      mkdir -pv $DEST
+      echo "FAKEGIT cp -r %out/repos/$URL-$REVISION $DEST" >&2
+      cp -r %out/repos/$URL-$REVISION/* $DEST
+      chmod u+w -R $DEST
+    ''}
+
+    ${stdenv.lib.concatMapStrings
+       (r : ''
+        cp -r ${fetchsvn r} $out/repos/${hashname r}
+       ''
+       ) (import ./src-libs-svn.nix)
+    }
+
+    ${mkscript "$out/bin/checkout-svn.sh" ''
+      if test "$#" -ne 3; then
+        echo "Usage: $0 DESTINATION URL REVISION"
+        exit 1
+      fi
+      DEST=$1
+      URL=`echo $2 | tr :/ __`
+      REVISION=`echo $4 | tr :/ __`
+
+      rm -rf $DEST
+      mkdir -pv $DEST
+      echo "FAKE COPY %out/repos/$URL-$REVISION $DEST"
+      cp -r %out/repos/$URL-$REVISION/* $DEST
+      chmod u+w -R $DEST
+    ''}
+  '';
+}
diff --git a/pkgs/applications/science/misc/openmodelica/src-libs-git.nix b/pkgs/applications/science/misc/openmodelica/src-libs-git.nix
new file mode 100644
index 00000000000..aae5ab321fb
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/src-libs-git.nix
@@ -0,0 +1,71 @@
+[
+{ url = "https://github.com/modelica-3rdparty/ADGenKinetics.git"; rev = "42428db6e84bcde28543a3bba9bccee581309bb1"; sha256="14l005jwj1wz35gq8xlbzfz0bpsx99rs4q3dxkfh76yhnv1jh9h3"; }
+{ url = "https://github.com/modelica-3rdparty/ADMSL.git"; rev = "ed0305603f86b46d9af03e7d37dcb8b6704915b4"; sha256="15b0nqxyh8444az56ydjn594jikdl1ina5wamabk3nzm1yx218cl"; }
+{ url = "https://github.com/iea-annex60/modelica-annex60.git"; rev = "8015a01591bb24d219f57e7b69cdfcde66e39b47"; sha256="05k4pa007a6p628fq1xac0cfv8g8dnpy2bgy8h99rqpmlaa072z7"; }
+{ url = "https://github.com/OpenModelica/BioChem.git"; rev = "b5f3cb999f3cfad2bbb6fb429b496f61ecf2f628"; sha256="1l52dg888vwx4668spn59hqvfkpl9g06g8n2cdxiap7lvsyh6w9x"; }
+{ url = "https://github.com/modelica-3rdparty/BondGraph.git"; rev = "20c23e60d12989bd4668ccac47659d82d39d29cc"; sha256="1i9cmiy1ya04h2ld0gy0x2gvdrfksl66fmcrgdm1vpsnbb6pviv9"; }
+{ url = "https://github.com/modelica-3rdparty/BondLib.git"; rev = "df7a40fe612617da22e27d39edfa4b27d65f23d0"; sha256="005djwxd568zyk3ndss9hv165dci9x0dgjmcdjhnqmsap3w83hlz"; }
+{ url = "https://github.com/modelica-3rdparty/BrineProp.git"; rev = "fed013cdeec0fb9552964376b575a8e3635539ab"; sha256="020hm2q65d5iv3h8b3lhgl6j930vi2pbh4lvxv3b3k7i9z02q43a"; }
+{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "ef89361cc8673b077b9221efbf78aa63b4d7babd"; sha256="04gclknhl2f5z7w9fsbhwawisd0ibmvwpplx0siqwzvjx7nsmdg4"; }
+{ url = "https://github.com/lbl-srg/modelica-buildings.git"; rev = "444aa231f423b8d04225bf8672e3212d089fbfe4"; sha256="0q754mlkwqj0jcqsmxksvcz4ak2i86f9s41fhffh5jvra27cvq01"; }
+{ url = "https://github.com/modelica-3rdparty/Chemical.git"; rev = "aa2642608e587ddb6897e8c3ffabb3aa099510bd"; sha256="0y46spcb6rw0jpj4v20nlw8xlvi5kypij46f1msvwgr7dfgy4gl4"; }
+{ url = "https://github.com/modelica-3rdparty/ComplexLib.git"; rev = "0b78942ee4fa95ae71347a0d552dd869fdf4c708"; sha256="18llf5ccrq3b0f4cjznfycskwf78pik8370xv45w9gb51gamszrn"; }
+{ url = "https://github.com/lochel/ConPNlib.git"; rev = "bbf6e9711665d55e5a8cf2f7235fa013c2315104"; sha256="0g3ll44sn2ff14qxwdyakw9h5b8b7vzabxp8cb8km16wcdqzgcxx"; }
+{ url = "https://github.com/modelica-3rdparty/DESLib.git"; rev = "7a473d8d16b118c3ea05761c6f43b17fd9838e4e"; sha256="19f2121n8rdc9svcjk8irivsd9wqcb9ai9jx72s2r85fkbvm8jc3"; }
+{ url = "https://github.com/modelica-3rdparty/ExtendedPetriNets.git"; rev = "2f4eac0651c1ab0ed56b75ec61424e0ef15181d3"; sha256="0wwj756pg33qwb90ycbfkrk5xsiwsbrqvq3i16i4pisi21vl6jk9"; }
+{ url = "https://github.com/modelica-3rdparty/ExternData.git"; rev = "396164fa708cc7c7e64da55ac0b3cba23939f790"; sha256="09052qmv91a9wawsl93b5b3q47awrxhnsbb9mrv39kpnwygfh7dq"; }
+{ url = "https://github.com/modelica/ExternalMedia.git"; rev = "1b77869b31dc3509defeccb1236db4b05d2f6f5b"; sha256="05sszn4bn8r78syydyjq8csn9xv4az56mm9lrarqykqdh78pvlqp"; }
+{ url = "https://github.com/kdavies4/FCSys.git"; rev = "cb4b17f34313b9d8f2d4223d5365684b4dc1ab65"; sha256="114p7ja6b3fwlkvkkjhbx78fxc7v4af2sbs783hkdga86m1v4ib6"; }
+{ url = "https://github.com/modelica-3rdparty/FastBuildings.git"; rev = "1f5cfebc2f42c13e272bff639ffa3449d5740bf7"; sha256="0sry1n2pliddz0pjv8dp899fx98f16n1arc8zvq36k5grvi52fby"; }
+{ url = "https://github.com/modelica-3rdparty/FaultTriggering.git"; rev = "10c226b7e5b2af901b356ac437c90d6616a6e9a4"; sha256="0a9j18qjwigq11nghl97syxa9bscs1aj6vwpkldh50csnj5h6g2s"; }
+{ url = "https://github.com/modelica-3rdparty/FuzzyControl.git"; rev = "19ff67ff129a440482cc85f216f287b05ea6ec0d"; sha256="0ijcqns7pijsavijn4wlrdsz64k5ks626sly7r28wvrk9af2m2cx"; }
+{ url = "https://github.com/modelica-3rdparty/HelmholtzMedia.git"; rev = "e54fcd0e436d65c85de6c6b935983e363cdc9f6c"; sha256="05afh0379fx4mjjn7jb8j5p4am6qi62hjxvasb38b6fcp9rnysn4"; }
+{ url = "https://github.com/modelica-3rdparty/IdealizedContact.git"; rev = "8ebac550d913f6d2b3af4d1aea5044e72c7eb6b0"; sha256="03gh2a7hf44clshwkiyz786w847hmyr3bicdqd9969fbirgcqn6m"; }
+{ url = "https://github.com/modelica-3rdparty/IndustrialControlSystems.git"; rev = "6a2414307d5998c6d081efe803c2b575a532b3ba"; sha256="09la9h07x8bkh7zhrwykgj1467qdryjvxhvnnm8qvsim0dl9inc4"; }
+{ url = "https://github.com/modelica-3rdparty/LinearMPC.git"; rev = "1e91a5dcaa662cd30c5b09a9d0267289703f933b"; sha256="12094fqmwi65h0mc65b96krbj6b8dgn6jiww3fnv6khglb21kwvd"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "refs/tags/v1.6"; sha256="106w83ylgbxf63wr7p9z5q8vqz2qcsaw0zwaad7d3saq6rdbj30c"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "d442bcd461b8db9873e33b6141bdbd37bcff9de8"; sha256="1icnd0fxix5khnsvdhy7kmzn6lnqkggbvfrbln98a2h5zqd6s32w"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "af2a3e1597d648d6826665c89cf9eaf5c2a632bc"; sha256="0ryk0iwakdazhsjqvan41w6f9bvgl329zkqchcdg6nkidiigziwh"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "48943d87db45a6c312b5a5789d384acde44a934b"; sha256="1hi2vkpmx734baa9m1lqzallcykhh3snd68r387gndiv96f6zx3n"; }
+{ url = "https://github.com/modelica/Modelica.git"; rev = "164af873cc5955c50f9592a7d2f3c155f703849c"; sha256="071svqwd72sy85sngbg5r22ab693c0gw2xx29gk1sqrk2nchmvia"; }
+{ url = "https://github.com/OpenModelica/modelica3d.git"; rev = "daf5669b03ad33fc6999671d1c0e7521134a282b"; sha256="1scs6v2cp2r4jz4diszwbqf9kvzf49pid50dmpsz0gfhx06j9y2v"; }
+{ url = "https://github.com/modelica-deprecated/ModelicaAdditions.git"; rev = "568db43766186826b880f9d4bfafeff25cc2c4ab"; sha256="1py5i3afxdvz1dmxxwb2mqj8kyzdhg4jnnqwl8h50akizg4i49pl"; }
+{ url = "https://github.com/xogeny/ModelicaBook.git"; rev = "0e670cfae4db653bd34ea777d6b56423e9be2c9f"; sha256="0lxh08w6nii4p5yk7c0xmfi5y4xkjkzz4hirr3kqdhdfybcwq824"; }
+{ url = "https://github.com/modelica-compliance/compliance.git"; rev = "ca5092c14bb7af4507a10700ee49181a3a3ee199"; sha256="12ja6dhwlbq412kxjdviypgchipxpsg8l0sf6r17g6lbsi19i2b6"; }
+{ url = "https://github.com/modelica-3rdparty/ModelicaDEVS.git"; rev = "a987aa9552fbbe71b2ee2e8c28958f9d213087ae"; sha256="0qcw7vw28xadim0h8kr2km09d8vdj05ibdpzcnpny9n43pm9s5hx"; }
+{ url = "https://github.com/modelica/Modelica_DeviceDrivers.git"; rev = "db912ba7e1317b8f6a776ccf9a19f69c77a9c477"; sha256="052h2lr7xgfag5fks19wbldqmb985kxlc5fzysl7c9w3fnijp0ml"; }
+{ url = "https://github.com/modelica/Modelica_EnergyStorages.git"; rev = "9f057365232364e31a31a8e525f96284b98c7de3"; sha256="195m5b3z8qgg9kih9zsdx1h8zgrm37q63890r59akka05a97j48h"; }
+{ url = "https://github.com/modelica/Modelica_LinearSystems2.git"; rev = "18916fdc485285baab12481701b53d4eb606a3f1"; sha256="0fhvdwcgk8q3z1a98l2bxv8a6dysrs4ll6xfyzpni7yq8gp4mg4q"; }
+{ url = "https://github.com/modelica/Modelica_Synchronous.git"; rev = "d0f5ee57bc7b639738e88026674a87343b33dbe1"; sha256="0l75v4d0fgf07ify0h3skh4y9pfw9gxh9hbj1lbsdgglmzlrcvbg"; }
+{ url = "https://github.com/modelica-3rdparty/MotorcycleDynamics.git"; rev = "2be2667f9936d88ffb9b8a8246c5af9ccb0b307f"; sha256="0jazwmpqpyhhgs9qdn9drmplgp2yjs0ky7wll5x9929dkgy80m6x"; }
+{ url = "https://github.com/modelica-3rdparty/NCLib.git"; rev = "ed3d72f176ac6b7031ce73be9d80101141e74a69"; sha256="1pbpv8w1lsa9vdwp7qbih8iim91ms22b01wz376b548d0x2r95la"; }
+{ url = "https://github.com/modelica-3rdparty/NeuralNetwork.git"; rev = "c44e4d1fe97fd4f86dafcd05ad3713692e3f1806"; sha256="0s1v8k71zq1s9gjlvi3zr23nwfknp4x17cxm64a0y3vsi3kahj2s"; }
+{ url = "https://github.com/DLR-SR/Noise.git"; rev = "9b57476845539e56769cf76ea0fe7bf3c7eb5d11"; sha256="0icrb63f6dm4gww2nyby9i7s7qxvhvialp36xzcgmi7nlq7crjr2"; }
+{ url = "https://github.com/modelica-3rdparty/ObjectStab.git"; rev = "2a723e0b223af50f4ffdd62f8ac901e0f87b9323"; sha256="1b6zi27slzzfbkmbcqxygsn5i5w0zkq0hfrfb72vf7mbgz07j19j"; }
+{ url = "https://github.com/cparedis/OpenHydraulics.git"; rev = "d3173d1f06f7d14c9d7c41769f143617ff03a3ad"; sha256="1hn5rcnmzcbiaqdnxfn02wddmrpj9bcdi9p680f31hbh3vb0i3r6"; }
+{ url = "https://github.com/lochel/PNlib.git"; rev = "44c7d277980b7a88b449b72edec0a56416b40fa9"; sha256="026wdhbxnzarmj8gw0as70vj8f1gwc51z38hjqpswxkl0xd6mfvp"; }
+{ url = "https://github.com/MarekMatejak/Physiolibrary.git"; rev = "49d59060f6e5b4cb68560c6d7467e84ea4318056"; sha256="0klqs2axjm3s780sq4plq4wmbf9mszz2jmq9fprgxy9pw7iszbhc"; }
+{ url = "https://github.com/dzimmer/PlanarMechanics.git"; rev = "d998a1b27355e83d2ff4849d71281a919a3234aa"; sha256="0vyq6mninn38wy2d60rk753xbkfqim2y6y31py7kq2mm170jfqf4"; }
+{ url = "https://github.com/modelica/PowerSystems.git"; rev = "7b551888089277a0dd979db636d47aba0279e8f0"; sha256="0y13f1nllc7riksnly25wmmp6mc30c1b48dbq2lr1nag6yg3blwm"; }
+{ url = "https://github.com/modelica/PowerSystems.git"; rev = "3abd48aa53bbcd3f3e2ddfa2371680febf8baf48"; sha256="1nr2nbpaxywk8cpwnk9rr2zr87mm2gb9b4plqipjdlrrkjlk9fka"; }
+{ url = "https://github.com/modelica-3rdparty/PraxisSimulationstechnik.git"; rev = "f7db177786f84033f3a50b7474988b190a1dfb46"; sha256="08bdm7k7w35kg9gkrvcn382zkwf5h3iwkkx60d5fj64j5d5klray"; }
+{ url = "https://github.com/modelica-3rdparty/QCalc.git"; rev = "af6c34dda691a9bdf7ca1de10650974b2d5cecf5"; sha256="0p0zhl27cnr492byrzib0dyn7zp5yb7wcr0spv10ngm6j90cij6y"; }
+{ url = "https://github.com/modelica-3rdparty/QSSFluidFlow.git"; rev = "d84a2c107132f2cd47ea3c3751238d69e4b1f64b"; sha256="02cdvv33pi0qlmg8n401s4cxf59l9b4ff4ixf7gwn4w4n1y9bw0g"; }
+{ url = "https://github.com/modelica-3rdparty/RealTimeCoordinationLibrary.git"; rev = "655ac1a22aa6deb04ea8e3869dd0aa9fb9540754"; sha256="19crf8pl9vpqq3pq1rhcbl49kkmnm4jrzpwrpqp8qc6dj8096za4"; }
+{ url = "https://github.com/modelica-3rdparty/ScalableTestSuite.git"; rev = "c6319908d45ac97ffb10e96cd42654bce36ffb97"; sha256="1g79d88bfmzcqvaghyyj86ajs38v0qnmjxbj8d53yp6nmgnaasx5"; }
+{ url = "https://github.com/modelica-3rdparty/Servomechanisms.git"; rev = "22e1874ef9ad46156617817c67a4fb1238621bf5"; sha256="0nwb7apayk7ba9iv27yv67wi4b934dy57kkvn0acxy393jhd8jqd"; }
+{ url = "https://openmodelica.org/git/SiemensPower.git"; rev = "73a3bfc6d2ddd72165bb0f3e7e9df48b643a5ed0"; sha256="0mvrkpkmr0bx2cvsb23syg7cs8k6a15vjf4n1hivdcigq4x8g2nc"; }
+{ url = "https://openmodelica.org/git/SiemensPower.git"; rev = "5ef2e38b64ff481801c0db19d52f0bef21f85f77"; sha256="1llnpl2x1g28gari1rk34hdnnwf7a4fwwxlf7i18d8bl1vsrfaja"; }
+{ url = "https://openmodelica.org/git/SiemensPower.git"; rev = "2bd9e367baaa8d44946897c3c3a32a4050ad2a2a"; sha256="1shm9blpn9m87ci6wwkinpmihr1fik9j0a0pj2nxy0cjrr2jzbn4"; }
+{ url = "https://github.com/modelica-3rdparty/Spot.git"; rev = "2f74417f1681570900a1ed373dcbe4b42634ec7b"; sha256="0k5h2k6x98zvvsafpw7y16xs9d6lxz0csa0mlm4wwggaywadn255"; }
+{ url = "https://github.com/modelica-3rdparty/SystemDynamics.git"; rev = "c58a26dc3e62a50e64fd336dc4aa499b2d5ad314"; sha256="0ra3a2vgqmry92kmm060gfa41mrpkgbs4swzl78ih3icawfzjz8q"; }
+{ url = "https://github.com/modelica-3rdparty/ThermoPower.git"; rev = "e012268625dd1645fe5570cf31d64129d83a8192"; sha256="1rlkli48kc9hnkplgb0bjkb6ajn7agiw4yh9l5sfvlv7k7k2gc8l"; }
+{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "d4f9c3ed35f7520f82439eb6e9f4057ae0f82b73"; sha256="0hxbn26g479qkr6rrglx9ljdxnpzd5ll1sf2v08skghrdjjb8jcx"; }
+{ url = "https://openmodelica.org/git/ThermoSysPro.git"; rev = "51e7ea2d2e121ee640e7897335c294923f8eaeb0"; sha256="0l11mzjkaxndsqrnnr0z7qvk08svv229119qkm81yb53ich9wnyw"; }
+{ url = "https://github.com/modelica/VehicleInterfaces.git"; rev = "ad956a35643d53e207ee126d67ea1f3f38337a39"; sha256="0g90cqwjpi06gn7vca5kqnz56im76s2hrdqjhsj2bl43rza8mhr0"; }
+{ url = "https://github.com/modelica-3rdparty/WasteWater.git"; rev = "90ff44ac791ba5ed98444c8597efbd2a2af01cad"; sha256="1icrn0y389rhxmf6i0mnsfgw9v9j5innpkz3q069rfm2ji268b12"; }
+{ url = "https://github.com/xogeny/XogenyTest.git"; rev = "9b98981e8ff0f440dd319d1a806e1fd2f0ab3436"; sha256="18glaxrlxfml26w7ljlf0yj3ah1fnhpbg01py28nplsgnrfwfwqj"; }
+{ url = "https://github.com/modelica-3rdparty/msgpack-modelica.git"; rev = "6ce2ca600c4902038c0f20b43ed442f1ee204310"; sha256="01x5a9y11yf62sc0j2y49yxwm24imj2lfl3z5mwvi9038gwn0lkx"; }
+{ url = "https://github.com/modelica-3rdparty/netCDF-DataReader.git"; rev = "3d2cc8272abfbc4b667d8868f851bf3e11c6f00e"; sha256="194810a4rn0flxgirrlnxsbxarnm97309dkp1w7nva9zv1q3wj7h"; }
+{ url = "https://github.com/joewa/open-bldc-modelica.git"; rev = "7817cd703b88fc1f433269d32c31e75eb50a21c6"; sha256="1plkxkx51f9yi99ysarmx2ymldizvyr0m66k996y5lj5h81jv8a8"; }
+]
diff --git a/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix b/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix
new file mode 100644
index 00000000000..244da64fb4e
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/src-libs-svn.nix
@@ -0,0 +1,5 @@
+[
+{ url = "https://svn.modelica.org/projects/Modelica_ElectricalSystems/InstantaneousSymmetricalComponents"; rev = "7978"; sha256="0f100c7bz4ai3ryhpkbbszw8z6mykvg40p03ic92n2qq58wjk37z"; }
+{ url = "https://svn.modelica.org/projects/Modelica_EmbeddedSystems/trunk/Modelica_StateGraph2"; rev = "8121"; sha256="1cys57nc1yzkr5admc139qs5pa48rj3g69pb3j3s9xcmpd483hzp"; }
+{ url = "https://svn.modelica.org/projects/Modelica_ElectricalSystems/Modelica_PowerFlow/trunk"; rev = "3174"; sha256="0yviw1b8psn8vfyl4q1naylak3lcqi2q1bqplqg3gg9iw4aiymxl"; }
+]
diff --git a/pkgs/applications/science/misc/openmodelica/src-main.nix b/pkgs/applications/science/misc/openmodelica/src-main.nix
new file mode 100644
index 00000000000..16910675a05
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/src-main.nix
@@ -0,0 +1,6 @@
+{
+  url = "https://openmodelica.org/git-readonly/OpenModelica.git";
+  fetchSubmodules = true;
+  rev = "8c5d48eb31a638d5220621b20377bfe6f9e9535e";
+  sha256 = "15r0qpvnsb9a7nw3bh5n9r770ngd7p5py0ld2jy5mc4llaslkpa5";
+}
diff --git a/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh b/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh
new file mode 100755
index 00000000000..481a8979641
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/update-src-libs-git.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+CWD=`pwd`
+
+chko() { (
+T=`mktemp -d`
+trap "rm -rf $T" EXIT INT PIPE
+cd $T
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchgit `cat $CWD/src-main.nix`
+EOF
+nix-build check.nix
+cat result/libraries/Makefile.libs
+) }
+
+getsha256() { (
+T=`mktemp -d`
+trap "rm -rf $T" EXIT INT PIPE
+cd $T
+
+L=`echo $2 | wc -c`
+if expr $L '<' 10 >/dev/null; then
+T=`echo $2 | sed 's@"\(.*\)"@"refs/tags/\1"@'`
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchgit {
+  url = $1;
+  rev = $T;
+  sha256 = "0000000000000000000000000000000000000000000000000000";
+}
+EOF
+SHA=`nix-build check.nix 2>&1 | sed -n 's/.*instead has ‘\(.*\)’.*/\1/g p'`
+echo "{ url = $1; rev = $T; sha256=\"$SHA\"; }"
+else
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchgit {
+  url = $1;
+  rev = $2;
+  sha256 = "0000000000000000000000000000000000000000000000000000";
+}
+EOF
+SHA=`nix-build check.nix 2>&1 | sed -n 's/.*instead has ‘\(.*\)’.*/\1/g p'`
+echo "{ url = $1; rev = $2; sha256=\"$SHA\"; }"
+fi
+
+# nix-build check.nix
+) }
+
+OUT=src-libs-git.nix
+
+echo '[' > $OUT
+
+chko |
+grep checkout-git.sh |
+tr \' \" |
+while read NM TGT URL BR REV ; do
+  echo Trying $TGT $URL $REV >&2
+  getsha256 $URL $REV >> $OUT || exit 1
+done
+
+echo ']' >> $OUT
+
diff --git a/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh b/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh
new file mode 100755
index 00000000000..972bc7d61f1
--- /dev/null
+++ b/pkgs/applications/science/misc/openmodelica/update-src-libs-svn.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+CWD=`pwd`
+
+chko() { (
+T=`mktemp -d`
+trap "rm -rf $T" EXIT INT PIPE
+cd $T
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchgit `cat $CWD/src-main.nix`
+EOF
+nix-build check.nix
+cat result/libraries/Makefile.libs
+) }
+
+getsha256() { (
+T=`mktemp -d`
+trap "rm -rf $T" EXIT INT PIPE
+cd $T
+
+L=`echo $2 | wc -c`
+cat >check.nix <<EOF
+with import <nixpkgs> {};
+fetchsvn {
+  url = $1;
+  rev = $2;
+  sha256 = "0000000000000000000000000000000000000000000000000000";
+}
+EOF
+SHA=`nix-build check.nix 2>&1 | sed -n 's/.*instead has ‘\(.*\)’.*/\1/g p'`
+echo "{ url = $1; rev = $2; sha256=\"$SHA\"; }"
+
+# nix-build check.nix
+) }
+
+OUT=src-libs-svn.nix
+
+echo '[' > $OUT
+
+chko |
+grep checkout-svn.sh |
+tr \' \" |
+while read NM TGT URL REV ; do
+  echo Trying $TGT $URL $REV >&2
+  getsha256 $URL $REV >> $OUT || exit 1
+done
+
+echo ']' >> $OUT
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0aad3947f0f..6d4af1c6a01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2735,6 +2735,8 @@ let
 
   openmpi = callPackage ../development/libraries/openmpi { };
 
+  openmodelica = callPackage ../applications/science/misc/openmodelica { };
+
   qarte = callPackage ../applications/video/qarte {
     sip = pythonPackages.sip_4_16;
   };

From 80d6b708ac4d6573c361eedf64ebbe87ec3ce53e Mon Sep 17 00:00:00 2001
From: Sergey Mironov <Sergey.Mironov@kaspersky.com>
Date: Wed, 22 Jul 2015 16:43:01 +0300
Subject: [PATCH 077/123] openmodelica: Fix runtime PATHs using wrapProgram,
 fixes #8949

---
 .../science/misc/openmodelica/default.nix            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix
index 8420d445e09..3741187067d 100644
--- a/pkgs/applications/science/misc/openmodelica/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
 hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,
 lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
-doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk }:
+doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk, makeWrapper }:
 
 let
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which
     lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
     doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu
-    git gtk];
+    git gtk makeWrapper];
 
   patchPhase = ''
     cp -fv ${fakegit}/bin/checkout-git.sh libraries/checkout-git.sh
@@ -30,6 +30,14 @@ stdenv.mkDerivation {
     ./configure CC=${clang}/bin/clang CXX=${clang}/bin/clang++ --prefix=$out
   '';
 
+  postFixup = ''
+    for e in $(cd $out/bin && ls); do
+      wrapProgram $out/bin/$e \
+        --prefix PATH : "${gnumake}/bin" \
+        --prefix LIBRARY_PATH : "${liblapack}/lib:${blas}/lib"
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "OpenModelica is an open-source Modelica-based modeling and simulation environment";
     homepage    = "https://openmodelica.org";

From 8897299e8f375555d9c9819612fede3d5c86ccc9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Jul 2015 21:45:14 +0200
Subject: [PATCH 078/123] mezzo: fix build with OCaml-4.02

---
 pkgs/development/compilers/mezzo/default.nix | 22 ++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix
index 183640f5985..a0fe441b153 100644
--- a/pkgs/development/compilers/mezzo/default.nix
+++ b/pkgs/development/compilers/mezzo/default.nix
@@ -1,16 +1,30 @@
-{stdenv, fetchurl, ocaml, findlib, menhir, yojson, ulex, pprint, fix, functory}:
+{ stdenv, fetchFromGitHub, ocaml, findlib, menhir, yojson, ulex, pprint, fix, functory }:
+
+let
+  check-ocaml-version = with stdenv.lib; versionAtLeast (getVersion ocaml);
+in
+
+assert check-ocaml-version "4";
 
 stdenv.mkDerivation {
 
   name = "mezzo-0.0.m8";
 
-  src = fetchurl {
-    url = https://github.com/protz/mezzo/archive/m8.tar.gz;
-    sha256 = "17mfapgqp8ssa5x9blv72zg9l561zbiwv3ikwi6nl9dd36lwkkc6";
+  src = fetchFromGitHub {
+    owner = "protz";
+    repo = "mezzo";
+    rev = "m8";
+    sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6";
   };
 
   buildInputs = [ ocaml findlib yojson menhir ulex pprint fix functory ];
 
+  # Sets warning 3 as non-fatal
+  prePatch = stdenv.lib.optionalString (check-ocaml-version "4.02") ''
+    substituteInPlace myocamlbuild.pre.ml \
+    --replace '@1..3' '@1..2+3'
+  '';
+
   createFindlibDestdir = true;
 
   postInstall = ''

From 6d30af58a0340a654d94ef85ce6d9561bfeb00c2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 23 Jul 2015 15:14:50 -0700
Subject: [PATCH 079/123] ceph: Fix detection of git versioning

---
 pkgs/tools/filesystems/ceph/0.80.nix    | 3 ++-
 pkgs/tools/filesystems/ceph/0.94.nix    | 3 ++-
 pkgs/tools/filesystems/ceph/dev.nix     | 3 ++-
 pkgs/tools/filesystems/ceph/generic.nix | 7 +++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/0.80.nix b/pkgs/tools/filesystems/ceph/0.80.nix
index 302a65f626b..c987e0bd641 100644
--- a/pkgs/tools/filesystems/ceph/0.80.nix
+++ b/pkgs/tools/filesystems/ceph/0.80.nix
@@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1arajccczjdqp7igs17569xlq5cj4azcm5wwixg6ryypjr2grcbl";
+    leaveDotGit = true;
+    sha256 = "0s81j6yj8y27hlx1hid9maz0l7bhjjskjxzxlhsikzmdc1j27m4r";
   };
 
   patches = [
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 9b9455b9061..75045cb1344 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
+    leaveDotGit = true;
+    sha256 = "094f9knxgx8vb9fb1yzld9ib4m0wpqwqgqjl3xqf0dzm48nxqd73";
   };
 
   patches = [ ./fix-pgrefdebugging.patch ];
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
index 5cc183d1053..c57bc200f24 100644
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec {
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0kydjyvb1566mh33p6dlljfx1r4cfdj8ic4i19h5r9vavkc46nf0";
+    leaveDotGit = true;
+    sha256 = "13iyv53kq2ka5py759cdiw0wmzpsycskvhmyr74qkpxmw9g6177y";
   };
 
   patches = [ ./fix-pythonpath.patch ];
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index bece841d5f5..61659ef26fd 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -1,5 +1,5 @@
-{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which
-, boost, python, pythonPackages, libxml2, git, zlib
+{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which, git
+, boost, python, pythonPackages, libxml2, zlib
 
 # Optional Dependencies
 , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
@@ -112,14 +112,13 @@ stdenv.mkDerivation {
     ./0001-Makefile-env-Don-t-force-sbin.patch
   ];
 
-  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]
+  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which git ]
     ++ optionals (versionAtLeast version "9.0.2") [
       pythonPackages.setuptools pythonPackages.argparse
     ];
   buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
     boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
   ] ++ optional (versionAtLeast version "9.0.0") [
-    git                   # Used for the gitversion string
     pythonPackages.sphinx # Used for docs
   ] ++ optional stdenv.isLinux [
     linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs

From 0e1d8f0d7d3e670499f5483d8d181fa05d500d75 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 23 Jul 2015 15:15:02 -0700
Subject: [PATCH 080/123] ceph-git: 2015-07-20 -> 2015-07-23

---
 pkgs/tools/filesystems/ceph/git.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index f65b7ea7846..916e8ad9d5e 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,13 @@
-{ callPackage, fetchgit, git, ... } @ args:
+{ callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-07-20";
+  version = "2015-07-23";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "ce534e1e0addfe93194a553cec98799ea97affe4";
-    sha256 = "19i9fp06fdyhx5x6ryw5q81id0354601yxnywvir3i9hy51p9xaz";
+    rev = "f7bda9567d2a1acf015ab891eb5bb9ca0cdc8396";
+    leaveDotGit = true;
+    sha256 = "0z3i4aadyyklafm3lia8dg8l0wr3cvy53v3h7b533nm61lq07maf";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Fri, 24 Jul 2015 00:26:48 +0200
Subject: [PATCH 081/123] minecraft: fix wrapper

Adding jre lib path seems no longer needed, and so does padsp.
---
 pkgs/games/minecraft/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 9a19366a074..218a84d591d 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
-, mesa, openal, alsaOss, pulseaudioSupport ? false, libpulseaudio }:
+, mesa, openal
+, useAlsa ? false, alsaOss ? null }:
 
-assert jre ? architecture;
+assert useAlsa -> alsaOss != null;
 
 stdenv.mkDerivation {
-  name = "minecraft-2013.07.01";
+  name = "minecraft-2015.07.24";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar";
@@ -22,8 +23,8 @@ stdenv.mkDerivation {
     #!${stdenv.shell}
 
     # wrapper for minecraft
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
-    ${if pulseaudioSupport then "${libpulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
+    ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
       ${jre}/bin/java -jar $out/minecraft.jar
     EOF
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1924857bc5..0b5d933c96d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2203,7 +2203,7 @@ let
   mfoc = callPackage ../tools/security/mfoc { };
 
   minecraft = callPackage ../games/minecraft {
-    pulseaudioSupport = config.pulseaudio or true;
+    useAlsa = config.minecraft.alsa or false;
   };
 
   minecraft-server = callPackage ../games/minecraft-server { };

From 26d5a1fc62866812bb142cd228752c33bbbab214 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Fri, 24 Jul 2015 01:41:32 +0000
Subject: [PATCH 082/123] postgresql: add reload command

---
 nixos/modules/services/databases/postgresql.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 97927055ce3..4cff2818f3b 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -207,6 +207,7 @@ in
 
         serviceConfig =
           { ExecStart = "@${postgresql}/bin/postgres postgres ${toString flags}";
+            ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
             User = "postgres";
             Group = "postgres";
             PermissionsStartOnly = true;

From c8629266ef5adc0cec96bfed89fa6cb8fdcc220e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 23 Jul 2015 23:05:19 -0300
Subject: [PATCH 083/123] Dillo: 3.0.4.1 -> 3.0.5

---
 pkgs/applications/networking/browsers/dillo/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index 6760e123ccb..a54e5e0c370 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -6,18 +6,16 @@
 , libXcursor, libXi, libXinerama }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.4.1";
+  version = "3.0.5";
   name = "dillo-${version}";
 
   src = fetchurl {
     url = "http://www.dillo.org/download/${name}.tar.bz2";
-    sha256 = "0iw617nnrz3541jkw5blfdlk4x8jxb382pshi8nfc7xd560c95zd";
+    sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv";
   };
 
   buildInputs = with stdenv.lib;
-    [ fltk openssl libjpeg libpng libXcursor libXi libXinerama ];
-
-  nativeBuildInputs = [ perl ];
+  [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ];
 
   configureFlags =  "--enable-ssl";
 

From aae3bdab0358f53949f134ac8afbc350c7982e80 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Fri, 24 Jul 2015 13:03:02 +1000
Subject: [PATCH 084/123] teamspeak_client: create .desktop file

---
 .../instant-messengers/teamspeak/client.nix   | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 51707d2dca6..13798061b71 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
-, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
-, libredirect, quazip, less, which
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
+, xorg, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
+, libredirect, quazip, less, which, unzip
 }:
 
 let
@@ -15,6 +15,16 @@ let
       xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
     ];
 
+  desktopItem = makeDesktopItem {
+    name = "teamspeak";
+    exec = "ts3client";
+    icon = "teamspeak";
+    comment = "The TeamSpeak voice communication tool";
+    desktopName = "TeamSpeak";
+    genericName = "TeamSpeak";
+    categories = "Network";
+  };
+
 in
 
 stdenv.mkDerivation rec {
@@ -33,7 +43,13 @@ stdenv.mkDerivation rec {
                 else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz";
   };
 
-  buildInputs = [ makeWrapper less which ];
+  # grab the plugin sdk for the desktop icon
+  pluginsdk = fetchurl {
+    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.16.zip";
+    sha256 = "1qpqpj3r21wff3ly9ail4l6b57pcqycsh2hca926j14sdlvpv7kl";
+  };
+
+  buildInputs = [ makeWrapper less which unzip ];
 
   unpackPhase =
     ''
@@ -62,6 +78,12 @@ stdenv.mkDerivation rec {
       mkdir -p $out/lib/teamspeak
       mv * $out/lib/teamspeak/
 
+      # Make a desktop item
+      mkdir -p $out/share/applications/ $out/share/icons/
+      unzip ${pluginsdk}
+      cp pluginsdk/docs/client_html/images/logo.png $out/share/icons/teamspeak.png
+      cp ${desktopItem}/share/applications/* $out/share/applications/
+
       # Make a symlink to the binary from bin.
       mkdir -p $out/bin/
       ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client

From 61e0e5683980912bf8c5924689c6b14cc7762041 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 23 Jul 2015 23:31:16 -0500
Subject: [PATCH 085/123] nixpkgs: perf-tools 20150704 -> 20150723

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/perf-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix
index 7c9b319d255..d0776ce546a 100644
--- a/pkgs/os-specific/linux/perf-tools/default.nix
+++ b/pkgs/os-specific/linux/perf-tools/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation {
-  name = "perf-tools-20150704";
+  name = "perf-tools-20150723";
 
   src = fetchFromGitHub {
     owner = "brendangregg";
     repo = "perf-tools";
-    rev = "30ff4758915a98fd43020c1b45a63341208fd8b9";
-    sha256 = "0x59xm96jmpfgik6f9d6q6v85dip3kvi4ncijpghhg59ayyd5i6a";
+    rev = "80e25785e16acfbc0f048cae86a69006fa45148d";
+    sha256 = "13g98vqwy50yf2h0w6iav80kzwfz29mvnjw8akbjv4v36r9hcb69";
   };
 
   buildInputs = [ perl ];

From 3d9a4d79cf1838feb6e7200168e6e8f04fe81a17 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Fri, 24 Jul 2015 11:50:46 +0200
Subject: [PATCH 086/123] gnome3: Include gnome-shell-extensions in session
 path

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/default.nix                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index cf6d2cab349..01ab086b092 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -40,7 +40,7 @@ in {
       example = literalExample "[ pkgs.gnome3.gpaste ]";
       description = "Additional list of packages to be added to the session search path.
                      Useful for gnome shell extensions or gsettings-conditionated autostart.";
-      apply = list: list ++ [ gnome3.gnome_shell ]; 
+      apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];
     };
 
     environment.gnome3.packageSet = mkOption {
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 38c18a6a265..da5ae3f02a1 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -20,13 +20,13 @@ let
     gtk3 # for gtk-update-icon-cache
     glib_networking gvfs dconf gnome-backgrounds gnome_control_center
     gnome-menus gnome_settings_daemon gnome_shell
-    gnome_themes_standard defaultIconTheme
+    gnome_themes_standard defaultIconTheme gnome-shell-extensions
   ];
 
   optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
     gucharmap nautilus totem vino yelp gnome-bluetooth
     gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
-    gnome-shell-extensions gnome-system-log gnome-system-monitor
+    gnome-system-log gnome-system-monitor
     gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre

From e998ecd351a73b4fd445cb0314171c6eb4331da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Jul 2015 14:32:52 +0200
Subject: [PATCH 087/123] virtualbox: hack-fix the build, issue #8962

For now, until a better resolution is found.
---
 pkgs/applications/virtualization/virtualbox/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3250dc419d1..9112337d0a4 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -98,7 +98,10 @@ in stdenv.mkDerivation {
       src/apps/adpctl/VBoxNetAdpCtl.cpp
   '';
 
+  # first line: ugly hack, and it isn't yet clear why it's a problem
   configurePhase = ''
+    NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${stdenv.cc.libc}/include,,g')
+
     cat >> LocalConfig.kmk <<LOCAL_CONFIG
     VBOX_WITH_TESTCASES            :=
     VBOX_WITH_TESTSUITE            :=

From 447afef153bf6ebcf385028845c1e8947d61aaac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Jul 2015 19:25:58 +0200
Subject: [PATCH 088/123] Use builtin all and any functions

---
 lib/lists.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 9cb164aaade..fde6f5d42fc 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -90,12 +90,12 @@ rec {
 
   # Return true iff function `pred' returns true for at least element
   # of `list'.
-  any = pred: fold (x: y: if pred x then true else y) false;
+  any = builtins.any or (pred: fold (x: y: if pred x then true else y) false);
 
 
   # Return true iff function `pred' returns true for all elements of
   # `list'.
-  all = pred: fold (x: y: if pred x then y else false) true;
+  all = builtins.all or (pred: fold (x: y: if pred x then y else false) true);
 
 
   # Count how many times function `pred' returns true for the elements

From 6f6f66ac98218ed3061c75375784d12c5fceb687 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2015 02:38:46 +0200
Subject: [PATCH 089/123] Use concatStringSep primop

---
 lib/strings.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 895b230744f..d67052bbf13 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -12,7 +12,11 @@ rec {
 
 
   # Concatenate a list of strings.
-  concatStrings = lib.foldl' (x: y: x + y) "";
+  concatStrings =
+    if builtins ? concatStringsSep then
+      builtins.concatStringsSep ""
+    else
+      lib.foldl' (x: y: x + y) "";
 
 
   # Map a function over a list and concatenate the resulting strings.
@@ -31,8 +35,8 @@ rec {
 
   # Concatenate a list of strings with a separator between each element, e.g.
   # concatStringsSep " " ["foo" "bar" "xyzzy"] == "foo bar xyzzy"
-  concatStringsSep = separator: list:
-    concatStrings (intersperse separator list);
+  concatStringsSep = builtins.concatStringsSep or (separator: list:
+    concatStrings (intersperse separator list));
 
   concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list);
   concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list);

From 9cfd128a4219ba9d1d143852fdf25be0710f97f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2015 15:45:41 +0200
Subject: [PATCH 090/123] Use replaceStrings primop

---
 lib/strings.nix | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index d67052bbf13..6eb2652280c 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -8,7 +8,7 @@ in
 
 rec {
 
-  inherit (builtins) stringLength substring head tail isString;
+  inherit (builtins) stringLength substring head tail isString replaceStrings;
 
 
   # Concatenate a list of strings.
@@ -80,28 +80,25 @@ rec {
   # will likely be horribly inefficient; Nix is not a general purpose
   # programming language.  Complex string manipulations should, if
   # appropriate, be done in a derivation.
-  stringToCharacters = s: let l = stringLength s; in
-    if l == 0
-    then []
-    else map (p: substring p 1 s) (lib.range 0 (l - 1));
+  stringToCharacters = s:
+    map (p: substring p 1 s) (lib.range 0 (stringLength s - 1));
 
 
-  # Manipulate a string charcater by character and replace them by strings
-  # before concatenating the results.
+  # Manipulate a string charactter by character and replace them by
+  # strings before concatenating the results.
   stringAsChars = f: s:
     concatStrings (
       map f (stringToCharacters s)
     );
 
 
-  # same as vim escape function.
-  # Each character contained in list is prefixed by "\"
-  escape = list : string :
-    stringAsChars (c: if lib.elem c list then "\\${c}" else c) string;
+  # Escape occurrence of the elements of ‘list’ in ‘string’ by
+  # prefixing it with a backslash. For example, ‘escape ["(" ")"]
+  # "(foo)"’ returns the string ‘\(foo\)’.
+  escape = list: replaceChars list (map (c: "\\${c}") list);
 
 
-  # still ugly slow. But more correct now
-  # [] for zsh
+  # Escape all characters that have special meaning in the Bourne shell.
   escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]");
 
 
@@ -109,7 +106,8 @@ rec {
   # the `tr' command except that one character can be replace by multiple
   # ones.  e.g.,
   # replaceChars ["<" ">"] ["&lt;" "&gt;"] "<foo>" returns "&lt;foo&gt;".
-  replaceChars = del: new: s:
+  replaceChars = builtins.replaceStrings or (
+    del: new: s:
     let
       substList = lib.zipLists del new;
       subst = c:
@@ -119,20 +117,22 @@ rec {
         else
           found.snd;
     in
-      stringAsChars subst s;
+      stringAsChars subst s);
 
 
-  # Case conversion utilities
+  # Case conversion utilities.
   lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz";
   upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
   toLower = replaceChars upperChars lowerChars;
   toUpper = replaceChars lowerChars upperChars;
 
-  # Appends string context from another string
+
+  # Appends string context from another string.
   addContextFrom = a: b: substring 0 0 a + b;
 
+
   # Compares strings not requiring context equality
-  # Obviously, a workaround but works on all Nix versions
+  # Obviously, a workaround but works on all Nix versions.
   eqStrings = a: b: addContextFrom b a == addContextFrom a b;
 
 

From 2d9885db9e8b790ba2f8fc69b50a073260822a4f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2015 15:48:29 +0200
Subject: [PATCH 091/123] Remove eqStrings

It's no longer needed. Also clean up some comments.
---
 lib/strings.nix | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 6eb2652280c..c5af703e4e1 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -65,13 +65,13 @@ rec {
 
   # Determine whether a string has given prefix/suffix.
   hasPrefix = pref: str:
-    eqStrings (substring 0 (stringLength pref) str) pref;
+    substring 0 (stringLength pref) str == pref;
   hasSuffix = suff: str:
     let
       lenStr = stringLength str;
       lenSuff = stringLength suff;
     in lenStr >= lenSuff &&
-       eqStrings (substring (lenStr - lenSuff) lenStr str) suff;
+       substring (lenStr - lenSuff) lenStr str == suff;
 
 
   # Convert a string to a list of characters (i.e. singleton strings).
@@ -102,10 +102,7 @@ rec {
   escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]");
 
 
-  # replace characters by their substitutes.  This function is equivalent to
-  # the `tr' command except that one character can be replace by multiple
-  # ones.  e.g.,
-  # replaceChars ["<" ">"] ["&lt;" "&gt;"] "<foo>" returns "&lt;foo&gt;".
+  # Obsolete - use replaceStrings instead.
   replaceChars = builtins.replaceStrings or (
     del: new: s:
     let
@@ -131,11 +128,6 @@ rec {
   addContextFrom = a: b: substring 0 0 a + b;
 
 
-  # Compares strings not requiring context equality
-  # Obviously, a workaround but works on all Nix versions.
-  eqStrings = a: b: addContextFrom b a == addContextFrom a b;
-
-
   # Cut a string with a separator and produces a list of strings which were
   # separated by this separator. e.g.,
   # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"].
@@ -181,7 +173,7 @@ rec {
       sufLen = stringLength suf;
       sLen = stringLength s;
     in
-      if sufLen <= sLen && eqStrings suf (substring (sLen - sufLen) sufLen s) then
+      if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then
         substring 0 (sLen - sufLen) s
       else
         s;
@@ -200,14 +192,13 @@ rec {
 
 
   # Extract name with version from URL. Ask for separator which is
-  # supposed to start extension
-  nameFromURL = url: sep: let
-    components = splitString "/" url;
-    filename = lib.last components;
-    name = builtins.head (splitString sep filename);
-  in
-  assert ! eqStrings name filename;
-  name;
+  # supposed to start extension.
+  nameFromURL = url: sep:
+    let
+      components = splitString "/" url;
+      filename = lib.last components;
+      name = builtins.head (splitString sep filename);
+    in assert name !=  filename; name;
 
 
   # Create an --{enable,disable}-<feat> string that can be passed to
@@ -215,7 +206,8 @@ rec {
   enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";
 
 
-  # Create a fixed width string with additional prefix to match required width
+  # Create a fixed width string with additional prefix to match
+  # required width.
   fixedWidthString = width: filler: str:
     let
       strw = lib.stringLength str;
@@ -225,6 +217,6 @@ rec {
       if strw == width then str else filler + fixedWidthString reqWidth filler str;
 
 
-  # Format a number adding leading zeroes up to fixed width
+  # Format a number adding leading zeroes up to fixed width.
   fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
 }

From c399f94bb3bfad7fab7760d4842b38c9642541b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Jul 2015 15:55:39 +0200
Subject: [PATCH 092/123] intersperse: Fix quadratic performance

---
 lib/strings.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index c5af703e4e1..bac03c9d7ad 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -29,8 +29,7 @@ rec {
   intersperse = separator: list:
     if list == [] || length list == 1
     then list
-    else [(head list) separator]
-         ++ (intersperse separator (tail list));
+    else tail (lib.concatMap (x: [separator x]) list);
 
 
   # Concatenate a list of strings with a separator between each element, e.g.
@@ -128,9 +127,9 @@ rec {
   addContextFrom = a: b: substring 0 0 a + b;
 
 
-  # Cut a string with a separator and produces a list of strings which were
-  # separated by this separator. e.g.,
-  # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"].
+  # Cut a string with a separator and produces a list of strings which
+  # were separated by this separator; e.g., `splitString "."
+  # "foo.bar.baz"' returns ["foo" "bar" "baz"].
   splitString = _sep: _s:
     let
       sep = addContextFrom _s _sep;

From 3d6bd6a1facff3993d1b581dfcf9ee2b6a751642 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 24 Jul 2015 16:56:46 +0200
Subject: [PATCH 093/123] gfortran: disable parallel building to avoid weird
 build failures

More details are at https://github.com/NixOS/nixpkgs/commit/784025c7475610fb2fe8e28044d9d50bec1d93d1#commitcomment-12328357.
---
 pkgs/development/compilers/gcc/4.9/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 9069387762f..cf67d880a2c 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -61,7 +61,10 @@ let version = "4.9.3";
     # Whether building a cross-compiler for GNU/Hurd.
     crossGNU = cross != null && cross.config == "i586-pc-gnu";
 
-    enableParallelBuilding = true;
+    # Builds of gfortran have failed with strange errors that we cannot reproduce
+    # (http://hydra.nixos.org/build/23951123). Our best guess is that the build
+    # system has bugs that are exposed by compiling with multiple threads.
+    enableParallelBuilding = !langFortran;
 
     patches = [ ]
       ++ optional enableParallelBuilding ../parallel-bconfig.patch

From e3c374fac4fa76ad92275fd7a109e5098e086969 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 24 Jul 2015 12:15:37 -0400
Subject: [PATCH 094/123] cron: Actually enable the service if enabled

---
 nixos/modules/services/scheduling/cron.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index a92e8b65d2a..02d80a77da5 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -93,7 +93,7 @@ in
 
     { services.cron.enable = mkDefault (allFiles != []); }
 
-    (mkIf (config.services.cron.enable && allFiles != []) {
+    (mkIf (config.services.cron.enable) {
 
       security.setuidPrograms = [ "crontab" ];
 

From a0249ed425d7c7a357716736d489e6c187997566 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 24 Jul 2015 20:46:14 +0200
Subject: [PATCH 095/123] buildRustPackage: Fix rust builds due to #7524

Fixes #8966
---
 pkgs/build-support/rust/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index cd19782e611..c23581d9601 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation (args // {
     export CARGO_HOME="$(realpath deps)"
 
     # Let's find out which $indexHash cargo uses for file:///dev/null
-    (cd $sourceRoot && cargo fetch &>/dev/null)
+    (cd $sourceRoot && cargo fetch &>/dev/null) || true
     cd deps
     indexHash="$(basename $(echo registry/index/*))"
 

From 6b0452768cc5eb87e929d19d3b7d80d785b8c01b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 24 Jul 2015 21:40:25 +0200
Subject: [PATCH 096/123] geolite-legacy: 2015-07-08 -> 2015-07-24

---
 pkgs/data/misc/geolite-legacy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 138a9c40c79..49db550c503 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,17 +8,17 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-07-08";
+  version = "2015-07-24";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "0c6jcmlgkybsqiwqwa21igjazf95dj38mn516cqqqfdg7ciaj1d5";
+    "1yacbh8qcakmnpipscdh99vmsm0874g2gkq8gp8hjgkgi0zvcsnz";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "1vi82p41vas18yp17yk236pn1xamsi9662aav79fa0hm43i3ydx3";
+    "038ll8142svhyffxxrg0isrr16rjbz0cnkhd14mck77f1v8z01y5";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
     "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";

From df6381afecee4aebc559ea94f72acaa7dbd6c6ed Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 24 Jul 2015 22:03:32 +0200
Subject: [PATCH 097/123] stress-ng: 0.04.11 -> 0.04.12

Fixes/features:
  * Fix segfault in metrics because MMAPFORK macro not defined correctly
  * Add --cpu-load-slice option for CPU stressor time slice tweaks
---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 5336a54e190..a2cff62e2c8 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, attr }:
 
-let version = "0.04.11"; in
+let version = "0.04.12"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0hh1cqszviza4hvaj0hkhg8r42zjikcj6rc3l6fviwmr7f247ls5";
+    sha256 = "0gc5mai1dzhb7n8wsy2kzx0q85zbsa2ilvc2fpa30ilcwmg28kgm";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 

From 7a21c5c27e0513e647f801ef6cf6649cbdc42ad9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 02:27:57 +0200
Subject: [PATCH 098/123] font-awesome-ttf: update sha256 hash changed upstream

cc maintainer @baldo.
---
 pkgs/data/fonts/font-awesome-ttf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix
index 7e07ec8a37c..ed91713d03a 100644
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
-    sha256 = "018syfvkj01jym60mpys93xv84ky9l2x90gprnm9npzwkw5169jc";
+    sha256 = "0wg9q6mq026jjw1bsyj9b5dgba7bb4h7i9xiwgsfckd412xpsbzd";
   };
 
   buildCommand = ''

From 1edef466c098eb0a94494223b7beeacf2f28507e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 16 Jul 2015 21:44:31 +0200
Subject: [PATCH 099/123] python-packages: prompt_toolkit 0.42 -> 0.43

New features:
- Added eventloop and patch_stdout parameters to get_input.
- Inputhook support added.
- Added ShowLeadingWhiteSpaceProcessor and ShowTrailingWhiteSpaceProcessor
  processors.
- Accept Filter as multiline parameter in 'shortcuts'.
- MultiColumnCompletionsMenu + display_completions_in_columns parameter
  in shortcuts.

Backwards incompatible changes (not used in nixpkgs):
- Layout.width was renamed to preferred_width and now receives a
  max_available_width parameter.
---
 pkgs/top-level/python-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 19f8695c8f8..dd91cd41c38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9161,6 +9161,10 @@ let
       click configobj prompt_toolkit psycopg2 pygments sqlparse
     ];
 
+    postPatch = ''
+      substituteInPlace setup.py --replace "==" ">="
+    '';
+
     meta = {
       inherit version;
       description = "Command-line interface for PostgreSQL";
@@ -9460,10 +9464,10 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.42";
+    version = "0.43";
 
     src = pkgs.fetchurl {
-      sha256 = "04nywwyxzkl3qgah29i959irsbqi8viiadxfkxycqh7hq2yq8h86";
+      sha256 = "1z5fap8c7q27p0s82jn11i6fwg0g9zm2zy5na8is53kgbhl10fdr";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
     };
 

From 161c0e7876aea932b5344a578b65e412490c3822 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 03:03:35 +0200
Subject: [PATCH 100/123] pecita: 1.1 -> 5.0

The upstream source file has no version component and is updated in
place.

cc maintainer @rycee.
---
 pkgs/data/fonts/pecita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index d83d9afcdfd..a64512af845 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pecita-${version}";
-  version = "1.1";
+  version = "5.0";
 
   src = fetchurl {
     url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "07krzpbmc5yhfbf3aklv1f150i2g1spaan9girmg3189jsn6qw6p";
+    sha256 = "1smf1mqciwavf29lwgzjam3xb37bwxp6wf6na4c9xv6islidsrd9";
   };
 
   phases = ["installPhase"];

From 6bff6eec672c36357fe5bff528dcf934a24518e0 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Sat, 25 Jul 2015 11:58:54 +1000
Subject: [PATCH 101/123] v4l2loopback: update 0.8.0 -> 0.9.1

---
 .../linux/v4l2loopback/default.nix            |  6 ++--
 .../linux/v4l2loopback/kernel-3.18-fix.patch  | 31 -------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index 127341412ab..13617360d2d 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "v4l2loopback-${version}-${kernel.version}";
-  version = "0.8.0";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "https://github.com/umlaeute/v4l2loopback/archive/v${version}.tar.gz";
-    sha256 = "1rhsgc4prrj8s6njixic7fs5m3gs94v9hhf3am6lnfh5yv6yab9h";
+    sha256 = "1crkhxlnskqrfj3f7jmiiyi5m75zmj7n0s26xz07wcwdzdf2p568";
   };
   
   preBuild = ''
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
     export PATH=${kmod}/sbin:$PATH
   '';
 
-  patches = [ ./kernel-3.18-fix.patch ];
-  
   buildInputs = [ kmod ];
   
   makeFlags = [
diff --git a/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch b/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch
deleted file mode 100644
index 9f6dc57f322..00000000000
--- a/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 21195cd6d1ff767a271359dfa7d201078f766611 Mon Sep 17 00:00:00 2001
-From: tatokis <tasos@tasossah.com>
-Date: Mon, 24 Nov 2014 16:28:33 +0200
-Subject: [PATCH] Updated v4l2loopback.c to compile on >= 3.18 kernel
-
----
- v4l2loopback.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/v4l2loopback.c b/v4l2loopback.c
-index bb228bb..67f6ed4 100644
---- a/v4l2loopback.c
-+++ b/v4l2loopback.c
-@@ -498,10 +498,15 @@ static ssize_t attr_store_maxopeners(struct device *cd,
- {
- 	struct v4l2_loopback_device *dev = NULL;
- 	unsigned long curr = 0;
--
-+	
-+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-+	if (kstrtoul(buf, 0, &curr))
-+		return -EINVAL;
-+	#else
- 	if (strict_strtoul(buf, 0, &curr))
- 		return -EINVAL;
--
-+	#endif
-+	
- 	dev = v4l2loopback_cd2dev(cd);
- 
- 	if (dev->max_openers == curr)

From 078ee4ac557d101af656eae2ef3a681f406b89b0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 04:29:27 +0200
Subject: [PATCH 102/123] copy-com: 1.47.0410 -> 3.2.01.0481 + several fixes

The graphical UI (the largest part of this package) never worked; fixed.

Added myself as a maintainer.
---
 .../modules/services/networking/copy-com.nix  | 106 +++++++++---------
 .../networking/copy-com/default.nix           |  44 +++++---
 2 files changed, 80 insertions(+), 70 deletions(-)

diff --git a/nixos/modules/services/networking/copy-com.nix b/nixos/modules/services/networking/copy-com.nix
index 36bd29109b8..69a41ab9796 100644
--- a/nixos/modules/services/networking/copy-com.nix
+++ b/nixos/modules/services/networking/copy-com.nix
@@ -1,53 +1,53 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  
-  cfg = config.services.copy-com;
-
-in 
-
-{
-  options = {
-
-    services.copy-com = {
-	  
-	  enable = mkOption {
-          default = false;
-          description = "
-            Enable the copy.com client.
-
-            The first time copy.com is run, it needs to be configured. Before enabling run 
-            copy_console manually.
-          ";
-      };
-
-      user = mkOption {
-        description = "The user for which copy should run.";
-      };
-
-      debug = mkOption {
-        default = false;
-        description = "Output more.";
-      };
-	  };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.postfix ];
-
-    systemd.services."copy-com-${cfg.user}" = {
-      description = "Copy.com Client";
-      after = [ "network.target" "local-fs.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.copy-com}/bin/copy_console ${if cfg.debug then "-consoleOutput -debugToConsole=dirwatch,path-watch,csm_path,csm -debug -console" else ""}";
-        User = "${cfg.user}";
-      };
-
-    };
-  };
-
-}
-
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.copy-com;
+
+in
+
+{
+  options = {
+
+    services.copy-com = {
+
+	  enable = mkOption {
+          default = false;
+          description = "
+            Enable the Copy.com client.
+            NOTE: before enabling the client for the first time, it must be
+            configured by first running CopyConsole (command line) or CopyAgent
+            (graphical) as the appropriate user.
+          ";
+      };
+
+      user = mkOption {
+        description = "The user for which the Copy.com client should be run.";
+      };
+
+      debug = mkOption {
+        default = false;
+        description = "Output more (debugging) messages to the console.";
+      };
+	  };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.postfix ];
+
+    systemd.services."copy-com-${cfg.user}" = {
+      description = "Copy.com client";
+      after = [ "network.target" "local-fs.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.copy-com}/bin/CopyConsole ${if cfg.debug then "-consoleOutput -debugToConsole=dirwatch,path-watch,csm_path,csm -debug -console" else ""}";
+        User = "${cfg.user}";
+      };
+
+    };
+  };
+
+}
+
diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
index 9ef8caafa98..3a3cf4df284 100644
--- a/pkgs/applications/networking/copy-com/default.nix
+++ b/pkgs/applications/networking/copy-com/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, coreutils, fetchurl, patchelf, gcc }:
+{ stdenv, fetchurl, patchelf, fontconfig, freetype
+, gcc, glib, libICE, libSM, libX11, libXext, libXrender }:
 
 let
   arch = if stdenv.system == "x86_64-linux" then "x86_64"
@@ -13,45 +14,54 @@ let
 
   appdir = "opt/copy";
   
+  libPackages = [ fontconfig freetype gcc.cc glib libICE libSM libX11 libXext
+    libXrender ];
+  libPaths = stdenv.lib.concatStringsSep ":"
+    (map (path: "${path}/lib") libPackages);
+
 in stdenv.mkDerivation {
   
-  name = "copy-com-1.47.0410";
+  name = "copy-com-3.2.01.0481";
 
   src = fetchurl {
     # Note: copy.com doesn't version this file. Annoying.
     url = "https://copy.com/install/linux/Copy.tgz";
-    sha256 = "a48c69f6798f888617cfeef5359829e619057ae0e6edf3940b4ea6c81131012a";
+    sha256 = "0bpphm71mqpaiygs57kwa23nli0qm64fvgl1qh7fkxyqqabh4g7k";
   };
 
-  buildInputs = [ coreutils patchelf ];
+  nativeBuildInputs = [ patchelf ];
 
   phases = "unpackPhase installPhase";
 
   installPhase = ''
     mkdir -p $out/opt
     cp -r ${arch} "$out/${appdir}"
-    ensureDir "$out/bin"
-    ln -s "$out/${appdir}/CopyConsole" "$out/bin/copy_console"
-    ln -s "$out/${appdir}/CopyAgent" "$out/bin/copy_agent"
-    ln -s "$out/${appdir}/CopyCmd" "$out/bin/copy_cmd"
-    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
-      "$out/${appdir}/CopyConsole"
 
-    RPATH=${gcc.cc}/lib:$out/${appdir}
-    echo "updating rpaths to: $RPATH"
+    mkdir -p "$out/bin"
+    for binary in Copy{Agent,Console,Cmd}; do
+      binary="$out/${appdir}/$binary"
+      ln -sv "$binary" "$out/bin"
+      patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} "$binary"
+    done
+
+    # Older versions of this package happily installed broken copies of
+    # anything other than CopyConsole - which was then also mangled to
+    # copy_console for some reason. Keep backwards compatibility (only
+    # for CopyConsole) for now; the NixOS service is already fixed.
+    ln -sv "$out/bin"/{CopyConsole,copy_console}
+
+    RPATH=${libPaths}:$out/${appdir}
+    echo "Updating rpaths to $RPATH in:"
     find "$out/${appdir}" -type f -a -perm +0100 \
       -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
-
-
-
   '';
 
   meta = {
     homepage = http://copy.com;
-    description = "Copy.com Client";
+    description = "Copy.com graphical & command-line clients";
     # Closed Source unfortunately.
     license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ nathan-gs ];
+    maintainers = with stdenv.lib.maintainers; [ nathan-gs nckx ];
     # NOTE: Copy.com itself only works on linux, so this is ok.
     platforms = stdenv.lib.platforms.linux;
   };

From 61b3816ff260de7c5348f18e773e2de8f25a9f49 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 05:21:20 +0200
Subject: [PATCH 103/123] geolite-legacy: 2015-07-24 -> 2015-07-25

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

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 49db550c503..df9458903d3 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-07-24";
+  version = "2015-07-25";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "0xjzg76vdsayxyy1yyw64w781vad4c9nbhw61slh2qmazdr360g9";
+    "0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "18kxswr0b5klimfpj1zhxipvyvrljvcywic4jc1ggcr44lf4hj9w";

From 99457b40ac3a1404287c671f82d1a2ebbcbcbcc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 25 Jul 2015 08:43:53 +0200
Subject: [PATCH 104/123] compiz: fix build by dontMoveLib64 = true;

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

diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 6b9a579a08b..977409d0ef1 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
       --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
   '';
 
+  # automatic moving fails, perhaps due to having two $out/lib*/pkgconfig
+  dontMoveLib64 = true;
+
   meta = {
     description = "Compoziting window manager";
     homepage = "http://launchpad.net/compiz/";

From 389c90aa868f16165610b1efe34f344a02105ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 25 Jul 2015 09:13:52 +0200
Subject: [PATCH 105/123] llvmPackages*: refactor to use callPackage, etc.

Also use recurseIntoAttrs only on the default version (instead of only on 3.4).

The "self" variants (stil) don't build and they're inconsistent
versions. /cc @shlevy (fea2266290d6).
---
 .../compilers/llvm/3.6/default.nix            |  2 +-
 pkgs/top-level/all-packages.nix               | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix
index 65d81711f9e..c99070ba383 100644
--- a/pkgs/development/compilers/llvm/3.6/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b350b63af70..7889e5c334d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4143,24 +4143,21 @@ let
   llvm_36 = llvmPackages_36.llvm;
   llvm_35 = llvmPackages_35.llvm;
   llvm_34 = llvmPackages_34.llvm;
-  llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
+  llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { };
 
-  llvm_v = path: callPackage path { };
+  llvmPackages = recurseIntoAttrs llvmPackages_36;
 
-  llvmPackages = llvmPackages_36;
-
-  llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
-    inherit stdenv newScope fetchurl;
-    isl = isl_0_12;
-  });
-  llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };
-
-  llvmPackages_35 = import ../development/compilers/llvm/3.5 {
-    inherit pkgs stdenv newScope fetchurl isl;
+  llvmPackagesSelf = llvmPackages_34.override {
+    stdenv = libcxxStdenv;
   };
 
-  llvmPackages_36 = import ../development/compilers/llvm/3.6 {
-    inherit pkgs stdenv newScope fetchurl isl wrapCC;
+  llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 {
+    isl = isl_0_12;
+  };
+
+  llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 { };
+
+  llvmPackages_36 = callPackage ../development/compilers/llvm/3.6 {
     inherit (stdenvAdapters) overrideCC;
   };
 

From 9d5508d85c33b8fb22d79dde6176792eac2c2696 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 24 Jul 2015 19:03:11 +0200
Subject: [PATCH 106/123] meld: 3.12.3 -> 3.14.0 (close #8982)

---
 .../version-management/meld/default.nix          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 2a69d140669..2f7c4af0024 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper
 , libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo
-, hicolor_icon_theme
 }:
 
 
 let
-  minor = "3.12";
-  version = "${minor}.3";
+  minor = "3.14";
+  version = "${minor}.0";
 in
 
 buildPythonPackage rec {
@@ -15,13 +14,13 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz";
-    sha256 = "1zg6qhm53j0vxmjj3pcj2hwi8c12dxzmlh98zks0jnwhqv2p4dfv";
+    sha256 = "0g0h9wdr6nqdalqkz4r037569apw253cklwr17x0zjc7nwv2j3j3";
   };
 
   buildInputs = [
     python27 intltool makeWrapper itstool libxml2
     gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
   propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ];
 
@@ -41,18 +40,19 @@ buildPythonPackage rec {
   preFixup = ''
     wrapProgram $out/bin/meld \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
   '';
 
   patchPhase = ''
-    sed -e 's,#!.*,#!${python27}/bin/python27,' -i bin/meld
+    patchShebangs bin/meld
   '';
 
   pythonPath = [ gtk3 ];
 
   meta = with stdenv.lib; {
     description = "Visual diff and merge tool";
-    homepage = http://meld.sourceforge.net;
+    homepage = http://meldmerge.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = platforms.linux ++ stdenv.lib.platforms.darwin;
   };

From 174dd0eae73ad95b7bf8e364095f33e5163a448b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jul 2015 18:04:27 +0200
Subject: [PATCH 107/123] Fix description of boot.consoleLogLevel

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 4 ++++
 nixos/modules/system/boot/kernel.nix         | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index c9abff2ecfc..3712d3723d0 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -218,6 +218,8 @@ in
     system.boot.loader.kernelFile = "bzImage";
     environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
 
+    boot.consoleLogLevel = 7;
+
     # In stage 1 of the boot, mount the CD as the root FS by label so
     # that we don't need to know its device.  We pass the label of the
     # root filesystem on the kernel command line, rather than in
@@ -229,6 +231,8 @@ in
     boot.kernelParams =
       [ "root=LABEL=${config.isoImage.volumeID}"
         "boot.shell_on_fail"
+        "nomodeset"
+        "systemd.log_level=debug"
       ];
 
     fileSystems."/" =
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 63a095be631..ae868219aa4 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -49,9 +49,8 @@ in
       type = types.int;
       default = 4;
       description = ''
-        The kernel console log level.  Only log messages with a
-        priority numerically less than this will appear on the
-        console.
+        The kernel console log level.  Log messages with a priority
+        numerically less than this will not appear on the console.
       '';
     };
 

From c49b24c94004807f3de5eef9535d2d50d184dbd6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jul 2015 18:54:26 +0200
Subject: [PATCH 108/123] Fix capitalisation

---
 .../modules/system/boot/loader/grub/grub.nix  | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index c7cf712e3c2..0b349749244 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -10,7 +10,7 @@ let
 
   realGrub = if cfg.version == 1 then pkgs.grub
     else if cfg.zfsSupport then pkgs.grub2.override { zfsSupport = true; }
-    else if cfg.enableTrustedboot then pkgs.trustedGrub
+    else if cfg.enableTrustedBoot then pkgs.trustedGrub
            else pkgs.grub2;
 
   grub =
@@ -112,7 +112,7 @@ in
         description = ''
           The devices on which the boot loader, GRUB, will be
           installed. Can be used instead of <literal>device</literal> to
-          install grub into multiple devices (e.g., if as softraid arrays holding /boot).
+          install GRUB onto multiple devices.
         '';
       };
 
@@ -135,8 +135,8 @@ in
             example = "/boot1";
             type = types.str;
             description = ''
-              The path to the boot directory where grub will be written. Generally
-              this boot parth should double as an efi path.
+              The path to the boot directory where GRUB will be written. Generally
+              this boot path should double as an EFI path.
             '';
           };
 
@@ -166,7 +166,7 @@ in
             example = [ "/dev/sda" "/dev/sdb" ];
             type = types.listOf types.str;
             description = ''
-              The path to the devices which will have the grub mbr written.
+              The path to the devices which will have the GRUB MBR written.
               Note these are typically device paths and not paths to partitions.
             '';
           };
@@ -197,7 +197,7 @@ in
         type = types.lines;
         description = ''
           Additional bash commands to be run at the script that
-          prepares the grub menu entries.
+          prepares the GRUB menu entries.
         '';
       };
 
@@ -276,7 +276,7 @@ in
         example = "1024x768";
         type = types.str;
         description = ''
-          The gfxmode to pass to grub when loading a graphical boot interface under efi.
+          The gfxmode to pass to GRUB when loading a graphical boot interface under EFI.
         '';
       };
 
@@ -285,7 +285,7 @@ in
         example = "auto";
         type = types.str;
         description = ''
-          The gfxmode to pass to grub when loading a graphical boot interface under bios.
+          The gfxmode to pass to GRUB when loading a graphical boot interface under BIOS.
         '';
       };
 
@@ -330,10 +330,10 @@ in
         type = types.addCheck types.str
           (type: type == "uuid" || type == "label" || type == "provided");
         description = ''
-          Determines how grub will identify devices when generating the
+          Determines how GRUB will identify devices when generating the
           configuration file. A value of uuid / label signifies that grub
           will always resolve the uuid or label of the device before using
-          it in the configuration. A value of provided means that grub will
+          it in the configuration. A value of provided means that GRUB will
           use the device name as show in <command>df</command> or
           <command>mount</command>. Note, zfs zpools / datasets are ignored
           and will always be mounted using their labels.
@@ -344,7 +344,7 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Whether grub should be build against libzfs.
+          Whether GRUB should be build against libzfs.
           ZFS support is only available for GRUB v2.
           This option is ignored for GRUB v1.
         '';
@@ -354,7 +354,7 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Whether grub should be build with EFI support.
+          Whether GRUB should be build with EFI support.
           EFI support is only available for GRUB v2.
           This option is ignored for GRUB v1.
         '';
@@ -364,16 +364,16 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Enable support for encrypted partitions. Grub should automatically
+          Enable support for encrypted partitions. GRUB should automatically
           unlock the correct encrypted partition and look for filesystems.
         '';
       };
 
-      enableTrustedboot = mkOption {
+      enableTrustedBoot = mkOption {
         default = false;
         type = types.bool;
         description = ''
-          Enable trusted boot. Grub will measure all critical components during
+          Enable trusted boot. GRUB will measure all critical components during
           the boot process to offer TCG (TPM) support.
         '';
       };
@@ -429,7 +429,7 @@ in
       assertions = [
         {
           assertion = !cfg.zfsSupport || cfg.version == 2;
-          message = "Only grub version 2 provides zfs support";
+          message = "Only GRUB version 2 provides ZFS support";
         }
         {
           assertion = cfg.mirroredBoots != [ ];
@@ -441,19 +441,19 @@ in
           message = "You cannot have duplicated devices in mirroredBoots";
         }
         {
-          assertion = !cfg.enableTrustedboot || cfg.version == 2;
+          assertion = !cfg.enableTrustedBoot || cfg.version == 2;
           message = "Trusted GRUB is only available for GRUB 2";
         }
         {
-          assertion = !cfg.efiSupport || !cfg.enableTrustedboot;
+          assertion = !cfg.efiSupport || !cfg.enableTrustedBoot;
           message = "Trusted GRUB does not have EFI support";
         }
         {
-          assertion = !cfg.zfsSupport || !cfg.enableTrustedboot;
+          assertion = !cfg.zfsSupport || !cfg.enableTrustedBoot;
           message = "Trusted GRUB does not have ZFS support";
         }
         {
-          assertion = !cfg.enableTrustedboot;
+          assertion = !cfg.enableTrustedBoot;
           message = "Trusted GRUB can break your system. Remove assertion if you want to test trustedGRUB nevertheless.";
         }
       ] ++ flip concatMap cfg.mirroredBoots (args: [
@@ -471,7 +471,7 @@ in
         }
       ] ++ flip map args.devices (device: {
         assertion = device == "nodev" || hasPrefix "/" device;
-        message = "Grub devices must be absolute paths, not ${dev} in ${args.path}";
+        message = "GRUB devices must be absolute paths, not ${dev} in ${args.path}";
       }));
     })
 

From 6948c3ab80797770bc584e521b5c5a8ca02b495e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Jul 2015 19:03:52 +0200
Subject: [PATCH 109/123] Installer: Add nomodeset and blacklist the nouveau
 driver

I observed a hang at the moment the nouveau driver gets loaded on a
GTX 970.
---
 nixos/doc/manual/installation/installing-usb.xml |  4 ++--
 nixos/modules/installer/cd-dvd/iso-image.nix     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 97e3d2eaa1c..5def6e8753f 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -6,8 +6,8 @@
 
 <title>Booting from a USB Drive</title>
 
-<para>For systems without CD drive, the NixOS livecd can be booted from
-a usb stick. For non-UEFI installations,
+<para>For systems without CD drive, the NixOS live CD can be booted from
+a USB stick. For non-UEFI installations,
 <link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>
 will work. For UEFI installations, you should mount the ISO, copy its contents
 verbatim to your drive, then either:
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 3712d3723d0..1dec7bd0f43 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -30,8 +30,7 @@ let
   #   * COM32 entries (chainload, reboot, poweroff) are not recognized. They
   #     result in incorrect boot entries.
 
-  baseIsolinuxCfg =
-    ''
+  baseIsolinuxCfg = ''
     SERIAL 0 38400
     TIMEOUT ${builtins.toString syslinuxTimeout}
     UI vesamenu.c32
@@ -44,7 +43,7 @@ let
     LINUX /boot/bzImage
     APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
     INITRD /boot/initrd
-    '';
+  '';
 
   isolinuxMemtest86Entry = ''
     LABEL memtest
@@ -55,12 +54,12 @@ let
 
   isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry);
 
-  # The efi boot image
+  # The EFI boot image.
   efiDir = pkgs.runCommand "efi-directory" {} ''
     mkdir -p $out/EFI/boot
     cp -v ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi
     mkdir -p $out/loader/entries
-    echo "title NixOS LiveCD" > $out/loader/entries/nixos-livecd.conf
+    echo "title NixOS Live CD" > $out/loader/entries/nixos-livecd.conf
     echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf
     echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf
     echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf
@@ -232,7 +231,6 @@ in
       [ "root=LABEL=${config.isoImage.volumeID}"
         "boot.shell_on_fail"
         "nomodeset"
-        "systemd.log_level=debug"
       ];
 
     fileSystems."/" =
@@ -272,6 +270,8 @@ in
 
     boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ];
 
+    boot.blacklistedKernelModules = [ "nouveau" ];
+
     boot.initrd.kernelModules = [ "loop" ];
 
     # Closures to be copied to the Nix store on the CD, namely the init

From 4139c6c8098fc6ef84da283797615cffa8def731 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 19:55:06 +0200
Subject: [PATCH 110/123] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/0a07c4217de2cf899e648a14c9743c263b15fb98
 with hackage2nix revision e5e4464893b2b964424077e4fe7ef1a76e6d1173

---
 .../haskell-modules/hackage-packages.nix      | 488 ++++++++++++------
 1 file changed, 317 insertions(+), 171 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f15a27cec91..ba7bc517aa7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7354,6 +7354,7 @@ self: {
          http-types httpd-shed HUnit mtl network network-uri pureMD5 split
          test-framework test-framework-hunit wai warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
@@ -8143,10 +8144,9 @@ self: {
     ({ mkDerivation, array, base, containers, StateVar, transformers }:
      mkDerivation {
        pname = "Hipmunk";
-       version = "5.2.0.16";
-       sha256 = "0jnidzky0004xh1yzkcg41df21vbvqhk075d183jv6iwjiljsh3s";
+       version = "5.2.0.17";
+       sha256 = "1yxs1v9pzb35g3zlvycsx762dk8swrbry7ajr50zlq667j20n4a8";
        buildDepends = [ array base containers StateVar transformers ];
-       jailbreak = true;
        homepage = "https://github.com/meteficha/Hipmunk";
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
@@ -13969,6 +13969,24 @@ self: {
        license = "GPL";
      }) {};
 
+  "Southpaw" = callPackage
+    ({ mkDerivation, ALUT, base, bytestring, cairo, containers
+     , filepath, GLFW-b, gtk3, JuicyPixels, OpenAL, OpenGL, vector
+     , Win32
+     }:
+     mkDerivation {
+       pname = "Southpaw";
+       version = "0.1.0.2";
+       sha256 = "1zijb1b6ryrmq2230i1fr7iqz8iax9f2rwpy75fkggiknrd4xnpq";
+       buildDepends = [
+         ALUT base bytestring cairo containers filepath GLFW-b gtk3
+         JuicyPixels OpenAL OpenGL vector Win32
+       ];
+       jailbreak = true;
+       description = "Assorted utility modules";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "SpaceInvaders" = callPackage
     ({ mkDerivation, array, base, HGL, random, Yampa }:
      mkDerivation {
@@ -18147,8 +18165,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-cairo";
-       version = "3.1";
-       sha256 = "0b4nwzrkpxhiwph93zvyk8bi9770bsdnhxkzhbri3l0zsm9250kz";
+       version = "4.3.1";
+       sha256 = "0p54ssbl0ack51gwlj962x45954v4h22mqq6zqa5r8xrbcig2pdb";
        buildDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-cairo
        ];
@@ -18164,8 +18182,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-chart";
-       version = "4.3";
-       sha256 = "01wfjk4li0l2m7lqs9r6gxsv77wg94vdvipa05qynnsd9ldjnsfd";
+       version = "4.3.1";
+       sha256 = "18fagq4ddvqzi6r0c850yassgncicqy0plasfn262fmhgwflpa8n";
        buildDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
@@ -18181,8 +18199,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-diagrams";
-       version = "3.1";
-       sha256 = "1vjis6184cvw7jzg8a3nvs0d0sv30d6qx598phcq9ncs3bmh9h3f";
+       version = "4.3.1";
+       sha256 = "1plb44bcjnawg3fsb9crmlyzwzyiz802ldsk559ni9sb590ywr7n";
        buildDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-diagrams
          containers filepath
@@ -19972,23 +19990,22 @@ self: {
      }) {};
 
   "api-builder" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , Cabal, containers, hspec, HTTP, http-client, http-conduit
-     , http-types, text, transformers
+    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
+     , containers, hspec, HTTP, http-client, http-client-tls
+     , http-conduit, http-types, text, transformers
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.9.1.0";
-       sha256 = "1s9qxlinkg80idjcm246kgjg1k43pb4vvs0vd601pgz7im59qb1a";
+       version = "0.10.0.0";
+       sha256 = "0pzbp0grmnrc48h1cbsxsxzyjgnxzmf4d6cfi53ccq0v3yfybw9v";
        buildDepends = [
-         aeson attoparsec base bifunctors bytestring HTTP http-client
-         http-conduit http-types text transformers
+         aeson base bifunctors bytestring HTTP http-client http-client-tls
+         http-types text transformers
        ];
        testDepends = [
          aeson base bytestring Cabal containers hspec http-conduit text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -23440,12 +23457,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_8_0_0" = callPackage
+  "base_4_8_1_0" = callPackage
     ({ mkDerivation, ghc-prim, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.8.0.0";
-       sha256 = "1mf5s7niw0zmm1db7sr6kdpln8drcy77fn44h6sspima8flwcp44";
+       version = "4.8.1.0";
+       sha256 = "0rwya445hvnnzj3x5gsrmr72kr3yspd6w9mypxkrxxg19zfazjaj";
        buildDepends = [ ghc-prim rts ];
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -26384,7 +26401,9 @@ self: {
      mkDerivation {
        pname = "blank-canvas";
        version = "0.5";
+       revision = "1";
        sha256 = "05kfyjp9vncyzsvq018ilb8vh7fyzbc06nlx35jk3dzj6i6x5bgs";
+       editedCabalFile = "a9d9c32056144a2e5b84e96dfb3a5334aa89dc616c759e523c538a6b950d5084";
        buildDepends = [
          aeson base base64-bytestring bytestring colour containers
          data-default-class http-types kansas-comet scotty stm text
@@ -31087,8 +31106,8 @@ self: {
      }:
      mkDerivation {
        pname = "chatter";
-       version = "0.5.1.0";
-       sha256 = "014palhzpphwq3q1c211xajl30afr4ac6mjcpvyzqwxdr9ia74c8";
+       version = "0.5.2.0";
+       sha256 = "01594wp13kigqvr27112fmsrgz4cny4vlprqvyygp90k8mavxw8s";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -34588,8 +34607,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.4.3";
-       sha256 = "101kbmymsjlpsd9a717fn94y2fjgnxwl9j3cmfrah43g28r45sc8";
+       version = "1.2.5";
+       sha256 = "0iia5hc3rx813aayp839ixr377ajnrhfvpbjach266bk52scs05i";
        buildDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base
@@ -36695,8 +36714,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.6";
-       sha256 = "0lxmsd59sa37j8bc7y6v29s8wlscqa4xz15p60jiy5ks7am61wa5";
+       version = "5.9.7";
+       sha256 = "1617whwg9f0l6ji3jmd7fcs3n650mz0jpvrw4hf97r7mqzlyfkjp";
        buildDepends = [
          array base bytestring cereal cond directory filepath gray-extended
          hdaemonize hsyslog MonadRandom mtl old-locale process random split
@@ -46373,12 +46392,13 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-wai";
-       version = "1.0.0";
-       sha256 = "0g9h0r2i1lldmdkpnzlqjhxr7jd0v2s2w4gmsw83k1ahr6ia0dg7";
+       version = "1.0.1";
+       sha256 = "0cr53x8bxfmrx97v7jsb7gw3hqb94zp9xvvnl16080zmqm0gi2rh";
        buildDepends = [
          attoparsec base bytestring engine-io http-types mtl text
          transformers unordered-containers wai wai-websockets websockets
        ];
+       homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -47645,15 +47665,13 @@ self: {
      }) {};
 
   "exceptional" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, exceptions }:
      mkDerivation {
        pname = "exceptional";
-       version = "0.1.5.1";
-       revision = "1";
-       sha256 = "1fkz90d776z8fj8p3123ssqwxy9nmz4bgh9gn4nvg0xnvwzc069c";
-       editedCabalFile = "a79514b512d8776f9ae66a80aeb3f604ac9ae1d4c5c98fdd9ea2acc8c312adda";
-       buildDepends = [ base ];
-       homepage = "https://github.com/pharpend/exceptional";
+       version = "0.3.0.0";
+       sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns";
+       buildDepends = [ base exceptions ];
+       homepage = "https://github.com/";
        description = "Essentially the Maybe type with error messages";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -48152,8 +48170,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.3.1";
-       sha256 = "1yhd4f4p8f4nfj24rka8rfhr8s86mjpj019f3lbqkr9hnl1crj4l";
+       version = "1.4";
+       sha256 = "1cp9vsqgjc46v1i8w8lhakdk1qj6q2bd0y365qj0madpjj7q1qi8";
        buildDepends = [ base directory filepath process time unix ];
        testDepends = [ base directory filepath QuickCheck time unix ];
        homepage = "https://github.com/ndmitchell/extra#readme";
@@ -48387,6 +48405,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-builder" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck
+     , stm
+     }:
+     mkDerivation {
+       pname = "fast-builder";
+       version = "0.0.0.0";
+       sha256 = "1ga28vxsv4hk8491jv51jd8xqvafss56kkm97x2ma4naqx4v6snw";
+       buildDepends = [ base bytestring ghc-prim ];
+       testDepends = [ base bytestring process QuickCheck stm ];
+       homepage = "http://github.com/takano-akio/fast-builder";
+       description = "Fast ByteString Builder";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "fast-logger" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring
      , bytestring-builder, directory, filepath, hspec, text
@@ -49239,12 +49272,15 @@ self: {
      }) { inherit (pkgs) fftw;};
 
   "fgl" = callPackage
-    ({ mkDerivation, array, base, containers, mtl }:
+    ({ mkDerivation, array, base, containers, deepseq, hspec
+     , QuickCheck, transformers
+     }:
      mkDerivation {
        pname = "fgl";
-       version = "5.5.1.0";
-       sha256 = "0rcmz0xlyr1wj490ffja29z1jgl51gz19ka609da6bx39bwx7nga";
-       buildDepends = [ array base containers mtl ];
+       version = "5.5.2.0";
+       sha256 = "1r9vkv5v32nyqghr4fq3ijrdl2sr9bncfpj3zix53h5m2zyn7kg3";
+       buildDepends = [ array base containers deepseq transformers ];
+       testDepends = [ base containers hspec QuickCheck ];
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49253,9 +49289,9 @@ self: {
     ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
      mkDerivation {
        pname = "fgl-arbitrary";
-       version = "0.1.0.0";
-       sha256 = "0npgwg2lgi8rr3wm40q4a9srpnih3mzy1add2aazc4ahr32dfzm1";
-       buildDepends = [ base containers fgl QuickCheck ];
+       version = "0.2.0.0";
+       sha256 = "1116c4r1ick3xjhwwq9b6i1082njmxj2aymgkqppabj3d0hv43c4";
+       buildDepends = [ base fgl QuickCheck ];
        testDepends = [ base containers fgl hspec QuickCheck ];
        description = "QuickCheck support for fgl";
        license = stdenv.lib.licenses.bsd3;
@@ -52757,8 +52793,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.4.0";
-       sha256 = "0wpv9i80lai771fws5yg5ri05iskbq2vgar66f72xqwvz3nm44i7";
+       version = "0.4.1";
+       sha256 = "1qhik496296v42pjmlxxlimnw4z9p451ndc2fjvrid4g0knfzvg0";
        buildDepends = [ base linear spatial-math ];
        testDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -53495,20 +53531,21 @@ self: {
      }) {};
 
   "ghc-exactprint" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, free, ghc
-     , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb
+    ({ mkDerivation, base, containers, directory, filemanip, filepath
+     , free, ghc, ghc-paths, HUnit, mtl, random, silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.2";
-       sha256 = "1sqk6y6b1scn51kjbvdnazw34bkwmfii5dhb1fzwzx4cb4iqg3ik";
+       version = "0.3";
+       sha256 = "0wgqlll95fbxnni1dzlyiyb4d7lqp3hrfw9xh5hqsnqm45smi7j1";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
-         base containers directory filepath free ghc ghc-paths ghc-syb-utils
-         mtl syb
+         base containers directory filepath free ghc ghc-paths mtl syb
        ];
        testDepends = [
-         base containers directory filepath ghc ghc-paths ghc-syb-utils
-         HUnit mtl random stm syb
+         base containers directory filemanip filepath ghc ghc-paths HUnit
+         mtl random silently syb
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -54190,6 +54227,7 @@ self: {
          gitlib gitlib-libgit2 scientific shake split tagged text
          unordered-containers vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
@@ -58612,8 +58650,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock";
-       version = "2.16.0";
-       sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa";
+       version = "2.16.1";
+       sha256 = "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base haddock-api ];
@@ -58650,8 +58688,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.16.0";
-       sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj";
+       version = "2.16.1";
+       sha256 = "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2";
        buildDepends = [
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
@@ -58688,10 +58726,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-library";
-       version = "1.2.0";
-       revision = "1";
-       sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56";
-       editedCabalFile = "39bebb4a575c547378a245ee6028135602cbb73e5adbb4f7743449e5717517da";
+       version = "1.2.1";
+       sha256 = "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g";
        buildDepends = [ base bytestring deepseq transformers ];
        testDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
@@ -59101,8 +59137,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-agda";
-       version = "0.1.9";
-       sha256 = "1fh0901r140p3lvw54q8d6x17zhbvpik5bsx2hifa8q2g5bnxnxd";
+       version = "0.1.10";
+       sha256 = "1621l7pw2rcyalp17dcjp1bk650rs8w1i3swnwrzr9wwi6nrx7qb";
        buildDepends = [
          Agda base containers directory filepath hakyll mtl pandoc
          transformers xhtml
@@ -59315,8 +59351,8 @@ self: {
      }:
      mkDerivation {
        pname = "halma";
-       version = "0.2.0.0";
-       sha256 = "053r1npyq7f07d29bryrr0vwx4kpm3m1bdjkwr77znimshcvy9b3";
+       version = "0.2.0.1";
+       sha256 = "04b0djijhmgwr79hkprikqxdzfxabavrvkwmb1pv9qybsa82j6sc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -59327,7 +59363,6 @@ self: {
          base containers grid HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/timjb/halma";
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
@@ -60432,10 +60467,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "harp";
-       version = "0.4";
-       sha256 = "0fk3prqai1ynm5wdfsn9f700i9r499jc2z9fbsgy81k1rci2mrxh";
+       version = "0.4.1";
+       sha256 = "0q9q3rw9yqkryjf5vvm41ckycqjfaxnsrmc1p0kmdrlb4f4dgclz";
        buildDepends = [ base ];
-       homepage = "http://www.cs.chalmers.se/~d00nibro/harp/";
+       homepage = "https://github.com/seereason/harp";
        description = "HaRP allows pattern-matching with regular expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61344,8 +61379,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-neo4j-client";
-       version = "0.3.1.3";
-       sha256 = "0ws1mlf97b4xbysgvm4b3h15kfvk1mjdcxmcchl09c04wadaz86s";
+       version = "0.3.1.4";
+       sha256 = "171ar3vfhgijy79p0a4wqm0b8bisgqf8iqzm17yb5pwirlfm5hi6";
        buildDepends = [
          aeson base bytestring containers data-default hashable HTTP
          http-conduit http-types lifted-base mtl network-uri resourcet
@@ -61359,7 +61394,6 @@ self: {
          test-framework-quickcheck2 test-framework-th text transformers
          transformers-base transformers-compat unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
@@ -64979,29 +65013,29 @@ self: {
     ({ mkDerivation, base, bytestring, case-insensitive, configurator
      , containers, directory, errors, exceptions, filemanip, filepath
      , HandsomeSoup, hspec, HTTP, http-types, hxt, iso8601-time
-     , MissingH, mtl, multipart, old-locale, random, silently, stm, tar
-     , temporary, text, time, transformers, unix, unordered-containers
-     , utf8-string, wai, warp
+     , MissingH, mtl, multipart, old-locale, optparse-applicative
+     , random, silently, stm, tar, temporary, text, time, transformers
+     , unix, unordered-containers, utf8-string, wai, warp
      }:
      mkDerivation {
        pname = "heyefi";
-       version = "0.1.0.2";
-       sha256 = "0zjhdhigkfh3wrhwynpcqimasifs3qxkv8x2w7bl1ly8amlz7hf4";
+       version = "0.1.1.0";
+       sha256 = "13m66ix0kmvqwgvqh56mjdwgwpjjqi67hyr6giwhs63fr3wxw3f3";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base bytestring case-insensitive configurator directory errors
          exceptions filemanip filepath HandsomeSoup HTTP http-types hxt
-         iso8601-time MissingH mtl multipart old-locale random stm tar
-         temporary text time transformers unix unordered-containers
-         utf8-string wai warp
+         iso8601-time MissingH mtl multipart old-locale optparse-applicative
+         random stm tar temporary text time transformers unix
+         unordered-containers utf8-string wai warp
        ];
        testDepends = [
          base bytestring case-insensitive configurator containers directory
          errors exceptions filemanip filepath HandsomeSoup hspec HTTP
          http-types hxt iso8601-time MissingH mtl multipart old-locale
-         random silently stm tar temporary text time transformers unix
-         unordered-containers utf8-string wai warp
+         optparse-applicative random silently stm tar temporary text time
+         transformers unix unordered-containers utf8-string wai warp
        ];
        homepage = "https://github.com/ryantm/heyefi";
        description = "A server for Eye-Fi SD cards";
@@ -65927,8 +65961,8 @@ self: {
      }:
      mkDerivation {
        pname = "hint-server";
-       version = "1.4.1";
-       sha256 = "1b7dzij1c4940m00kbpnmymh6grd54d2xsgsi1d10x22bl7naq7m";
+       version = "1.4.2";
+       sha256 = "1rv6b0vlqs855m3bv047pvdkycmx2mv049cnp9iw8b97d0fsfyf5";
        buildDepends = [ base eprocess exceptions hint monad-loops mtl ];
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
@@ -69136,8 +69170,8 @@ self: {
     ({ mkDerivation, base, deepseq, HUnit, mtl, parallel, random }:
      mkDerivation {
        pname = "hs-carbon";
-       version = "0.1.0.0";
-       sha256 = "0i6jzqqlayxi1aqkrsdlb9kbj6ysj2qxr0rbmdw66zr5hinm345v";
+       version = "0.1.1.0";
+       sha256 = "0frip4q5vxvdkc4f8bigpp066i53f4786cj2znyq21h65zndaq53";
        buildDepends = [ base deepseq mtl parallel random ];
        testDepends = [ base HUnit ];
        description = "A Haskell framework for parallel monte carlo simulations";
@@ -72329,8 +72363,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-tokenizer";
-       version = "0.3.0.2";
-       sha256 = "1cd332xv2acx626hkiaakng1fwwkg9m2mg7p6jj1zzb981r6xh6y";
+       version = "0.3.0.3";
+       sha256 = "0xdjjmpp1wh17cb4lnziglwhv7frr0y5v216s5ycy9lkby9r9fyv";
        buildDepends = [
          attoparsec base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text text
@@ -72725,8 +72759,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.1.7";
-       sha256 = "1qdxd9dbzav7nky8s9ml6ik6i38mxzzg7dwj0pv1sp5prclk0jh1";
+       version = "2.1.7.1";
+       sha256 = "15caswd172i8hzwmxsd3rynnfz96v5iqg9avv1ybydikvvgbqx56";
        buildDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -78833,8 +78867,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-client";
-       version = "0.2.0.0";
-       sha256 = "13mc23dpyn9zsv1gfb913g8w8csjgnk5xrbbyhxgmam9kslpbxjj";
+       version = "0.2.1.0";
+       sha256 = "1ma5vahbcfarbvc0m8n88i0hn9szbvanmfd81jmvwkamkqxxgmis";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -80923,24 +80957,27 @@ self: {
      }) {};
 
   "lambdacms-core" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, containers
-     , data-default, esqueleto, file-embed, friendly-time, gravatar
-     , lists, mime-mail, old-locale, persistent, shakespeare
-     , template-haskell, text, time, uuid, wai, yesod, yesod-auth
-     , yesod-core, yesod-form
+    ({ mkDerivation, base, blaze-html, bytestring, classy-prelude
+     , classy-prelude-yesod, containers, data-default, esqueleto
+     , file-embed, friendly-time, gravatar, hspec, lists, mime-mail
+     , old-locale, persistent, shakespeare, template-haskell, text, time
+     , uuid, wai, yesod, yesod-auth, yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "lambdacms-core";
-       version = "0.3.0.0";
-       sha256 = "069mj7p3996bkl0vyj1bpphb6gs85r234svls9rzg2lgpxfp4gga";
+       version = "0.3.0.2";
+       sha256 = "0m8piymzcciy4dqhxqxslpm1rbzasm1diasr8ab05r9lcrs1dn76";
        buildDepends = [
          base blaze-html bytestring containers data-default esqueleto
          file-embed friendly-time gravatar lists mime-mail old-locale
          persistent shakespeare template-haskell text time uuid wai yesod
          yesod-auth yesod-core yesod-form
        ];
+       testDepends = [
+         base classy-prelude classy-prelude-yesod hspec yesod yesod-core
+       ];
        homepage = "http://lambdacms.org";
-       description = "LambdaCms Core subsite for Yesod apps";
+       description = "LambdaCms 'core' subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -87076,8 +87113,8 @@ self: {
      }:
      mkDerivation {
        pname = "mangopay";
-       version = "1.11.3";
-       sha256 = "1w9p0na0am2hl8f32qgkdym00kjjnavv1wxp6f4vh9msa6cfw6yl";
+       version = "1.11.4";
+       sha256 = "0yb6i97ihcywbgzqkrad72q33m7fgx903rqizlhb4nz4bkl8793d";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -96161,24 +96198,23 @@ self: {
 
   "opaleye" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
-     , case-insensitive, contravariant, postgresql-simple, pretty
-     , product-profunctors, profunctors, semigroups, text, time
-     , time-locale-compat, transformers, uuid
+     , case-insensitive, containers, contravariant, postgresql-simple
+     , pretty, product-profunctors, profunctors, QuickCheck, semigroups
+     , text, time, time-locale-compat, transformers, uuid, void
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.3.1.2";
-       revision = "3";
-       sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9";
-       editedCabalFile = "9ee83219b8bc26fe01cca7484513bc3373d2868855ba8757fd210482f0605852";
+       version = "0.4.0.0";
+       sha256 = "1dzfxy5r2phqcnijvq74ardjg9p2mlkpidg95dd3v9qiz1ls71rk";
        buildDepends = [
          attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
          profunctors semigroups text time time-locale-compat transformers
-         uuid
+         uuid void
        ];
        testDepends = [
-         base postgresql-simple product-profunctors profunctors time
+         base containers contravariant postgresql-simple product-profunctors
+         profunctors QuickCheck semigroups time
        ];
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
@@ -97689,8 +97725,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.2.2";
-       sha256 = "1ynxg9d3ssq9bby073j40913z11xap6gpf8hkjl0h0ll3mx89vb9";
+       version = "0.1.2.4";
+       sha256 = "1ay54zkxxa22nz5sr40d6k4bam81hxh19583kffwqdcp0af23d7l";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -99497,6 +99533,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-instances-iproute" = callPackage
+    ({ mkDerivation, base, bytestring, iproute, persistent }:
+     mkDerivation {
+       pname = "persistent-instances-iproute";
+       version = "0.1.0.1";
+       sha256 = "0nmk138kv020aa0pw29l177rb6rji4rnmw4ndnkn1xvp8gh3w0yn";
+       buildDepends = [ base bytestring iproute persistent ];
+       description = "Persistent instances for types in iproute";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "persistent-map" = callPackage
     ({ mkDerivation, base, binary, containers, directory, EdisonAPI
      , EdisonCore, filepath, LRU, mtl, stm-io-hooks
@@ -107583,6 +107630,19 @@ self: {
        broken = true;
      }) { ghcjs-base = null;};
 
+  "reflex-gloss" = callPackage
+    ({ mkDerivation, base, dependent-sum, gloss, reflex, transformers
+     }:
+     mkDerivation {
+       pname = "reflex-gloss";
+       version = "0.1.0.2";
+       sha256 = "18sbqryf6kxadgbvr6nh0f07897fq9fjj0h2w07xcdpp1ygg1nfg";
+       buildDepends = [ base dependent-sum gloss reflex transformers ];
+       homepage = "https://github.com/reflex-frp/reflex-gloss";
+       description = "An reflex interface for gloss";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reform" = callPackage
     ({ mkDerivation, base, containers, mtl, text }:
      mkDerivation {
@@ -108235,6 +108295,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rei" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , directory, regex-posix, split
+     }:
+     mkDerivation {
+       pname = "rei";
+       version = "0.1.0.1";
+       sha256 = "15xq2aj77y7l4frxkariw1z0c3y324iz697im8ynlzm88z2iixs6";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         attoparsec base bytestring containers directory regex-posix split
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/kerkomen/rei";
+       description = "Process lists easily";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "reified-records" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -112253,7 +112332,9 @@ self: {
      mkDerivation {
        pname = "scotty";
        version = "0.10.2";
+       revision = "1";
        sha256 = "0jlw82brnvc4cbpws0dq3qxn4rnb3z6rx6cfiarqwas14x4k3kl6";
+       editedCabalFile = "e0ab23342583c37af1a5422fad9a64926e54cad208dbcac75c70b3db40bf9e99";
        buildDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class http-types monad-control mtl nats network
@@ -112384,8 +112465,8 @@ self: {
     ({ mkDerivation, base, scotty, transformers, wai, warp, warp-tls }:
      mkDerivation {
        pname = "scotty-tls";
-       version = "0.3.0.0";
-       sha256 = "11zpbqrfmjyl8kck1za0pvf1b1gn0ih3an8vq85si22414bs5j23";
+       version = "0.4.0";
+       sha256 = "1axr54s8zi9jw5y6yl2izjx4xvd25y18nh4fw7asq9fz0nwjb45a";
        buildDepends = [ base scotty transformers wai warp warp-tls ];
        homepage = "https://github.com/dmjio/scotty-tls.git";
        description = "TLS for Scotty";
@@ -112754,27 +112835,29 @@ self: {
 
   "second-transfer" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, binary
-     , bytestring, conduit, containers, cpphs, exceptions, hashable
-     , hashtables, hslogger, http2, HUnit, lens, network, network-uri
-     , openssl, text, time, transformers
+     , bytestring, clock, conduit, containers, cpphs, deepseq
+     , exceptions, hashable, hashtables, hslogger, http2, HUnit, lens
+     , network, network-uri, openssl, pqueue, SafeSemaphore, stm, text
+     , time, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.5.5.1";
-       sha256 = "06ldrfzp96w7q99nhhhjhay6g0gsvg16x64hwjih1nswcj9rpl6x";
+       version = "0.6.0.0";
+       sha256 = "1w726qfbz86sicpg5apx5n767av61l3kn8fra7ban8f67amg3z7w";
        buildDepends = [
-         attoparsec base base16-bytestring binary bytestring conduit
-         containers exceptions hashable hashtables hslogger http2 lens
-         network network-uri text time transformers
+         attoparsec base base16-bytestring binary bytestring clock conduit
+         containers deepseq exceptions hashable hashtables hslogger http2
+         lens network network-uri pqueue SafeSemaphore stm text time
+         transformers
        ];
        testDepends = [
-         attoparsec base base16-bytestring binary bytestring conduit
-         containers cpphs exceptions hashable hashtables hslogger http2
-         HUnit lens network network-uri text time transformers
+         attoparsec base base16-bytestring binary bytestring clock conduit
+         containers cpphs deepseq exceptions hashable hashtables hslogger
+         http2 HUnit lens network network-uri pqueue SafeSemaphore stm text
+         time transformers unordered-containers
        ];
        buildTools = [ cpphs ];
        extraLibraries = [ openssl ];
-       jailbreak = true;
        homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
@@ -113753,6 +113836,7 @@ self: {
          network parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -114781,8 +114865,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.3";
-       sha256 = "1j9sv0dzhxkqml9v3r9nbwkpnjz1jhn09mlxlrjfakjmf3i9b9vp";
+       version = "1.6.3.1";
+       sha256 = "1yd54i4ac1h23b4l4mz9ixpkhj0zxnb8gamk5jdhzgsd809cqy9q";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -114803,15 +114887,17 @@ self: {
      }) {};
 
   "shelly-extra" = callPackage
-    ({ mkDerivation, async, base, HUnit, mtl, SafeSemaphore, shelly
-     , text
+    ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
+     , shelly, text
      }:
      mkDerivation {
        pname = "shelly-extra";
-       version = "0.3";
-       sha256 = "0rin1rqpzrjh4gs9235wy9w8rj4ac9yh83ap78a6nj0zi9w9vlwd";
+       version = "0.3.0.1";
+       sha256 = "1mc55m10s89mp2fz267sqhayaj0igj27kwyx7hnk5h23w0nhc0h5";
        buildDepends = [ async base mtl SafeSemaphore shelly ];
-       testDepends = [ base HUnit SafeSemaphore shelly text ];
+       testDepends = [
+         async base hspec HUnit mtl SafeSemaphore shelly text
+       ];
        homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shelly features that require extra dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -116557,8 +116643,8 @@ self: {
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
-       version = "0.4";
-       sha256 = "0j8nwc44q9l7wf4m3z7r32b7if7is21k3xgmi2206r4i1yxc869j";
+       version = "0.4.0.1";
+       sha256 = "1h501mcgfwak586gakqsjhmrdkq2mmfi8gwalb7wbsp57bchfg67";
        buildDepends = [ aeson base linear text vector ];
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
@@ -126241,8 +126327,8 @@ self: {
      }:
      mkDerivation {
        pname = "themoviedb";
-       version = "1.1.0.0";
-       sha256 = "0yvpijr2dk01g1ks65nalyz547l9aq97a9v1bx3lp47allihrp8k";
+       version = "1.1.1.0";
+       sha256 = "1859hbhznmp7x8kbqzrpyhndfy69jg01qrp1vh67557mznari6d8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -126251,7 +126337,6 @@ self: {
          transformers
        ];
        testDepends = [ base bytestring tasty tasty-hunit text time ];
-       jailbreak = true;
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
@@ -126736,8 +126821,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.4.33";
-       sha256 = "0xx02wbclq6hh50gz6vj3wmq7d5y7l4d6h48yxg3nwv4kwf44gf6";
+       version = "0.5.2";
+       sha256 = "0ll65q5fi8qfi50q9lqxdq9nsr7gizbh2xrsxgvj09nacdnwfwv0";
        buildDepends = [
          base binary bytestring colour containers hashable hmt hosc
          mersenne-random-pure64 mtl parsec process text time transformers
@@ -133418,6 +133503,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vimeta" = callPackage
+    ({ mkDerivation, aeson, base, byline, bytestring, containers
+     , directory, either, filepath, http-client, http-client-tls
+     , http-types, mtl, old-locale, optparse-applicative, parsec
+     , process, temporary, text, themoviedb, time, time-locale-compat
+     , transformers, xdg-basedir, yaml
+     }:
+     mkDerivation {
+       pname = "vimeta";
+       version = "0.2.0.0";
+       sha256 = "14xzqhykw963ja6wsnrbq8dh9wbk63aramzj4n210srwxy6yqc05";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base byline bytestring containers directory either filepath
+         http-client http-client-tls http-types mtl old-locale
+         optparse-applicative parsec process temporary text themoviedb time
+         time-locale-compat transformers xdg-basedir yaml
+       ];
+       homepage = "http://github.com/pjones/vimeta";
+       description = "Frontend for video metadata tagging tools";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "vimus" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, containers, data-default
      , deepseq, directory, filepath, hspec, hspec-expectations, libmpd
@@ -134195,6 +134304,7 @@ self: {
        sha256 = "1fm985jq1sa8v3vj850cpcjl6kcyq2kgq6xwpb1rmzi8zmb80kpc";
        buildDepends = [ base wai warp ];
        pkgconfigDepends = [ QtWebKit ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
@@ -134989,26 +135099,29 @@ self: {
 
   "warp" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , bytestring, case-insensitive, doctest, ghc-prim, hashable, hspec
-     , HTTP, http-date, http-types, HUnit, iproute, lifted-base, network
-     , old-locale, QuickCheck, simple-sendfile, streaming-commons, text
-     , time, transformers, unix, unix-compat, vault, wai
+     , bytestring, case-insensitive, containers, directory, doctest
+     , ghc-prim, hashable, hspec, HTTP, http-date, http-types, http2
+     , HUnit, iproute, lifted-base, network, old-locale, process
+     , QuickCheck, simple-sendfile, stm, streaming-commons, text, time
+     , transformers, unix, unix-compat, vault, wai, word8
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.0.13.1";
-       sha256 = "17vik5xf2amyi4pwq7wfia2a6f1pksa4ll155hbhkndhbwszvrkc";
+       version = "3.1.0";
+       sha256 = "1lx1fbcf8bkr5g6j0flk6mplnvs289lkyds5hv31naa450wbca62";
        buildDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
-         ghc-prim hashable http-date http-types iproute network
-         simple-sendfile streaming-commons text unix unix-compat vault wai
+         containers ghc-prim hashable http-date http-types http2 iproute
+         network simple-sendfile stm streaming-commons text unix unix-compat
+         vault wai word8
        ];
        testDepends = [
          array async auto-update base blaze-builder bytestring
-         case-insensitive doctest ghc-prim hashable hspec HTTP http-date
-         http-types HUnit iproute lifted-base network old-locale QuickCheck
-         simple-sendfile streaming-commons text time transformers unix
-         unix-compat vault wai
+         case-insensitive containers directory doctest ghc-prim hashable
+         hspec HTTP http-date http-types http2 HUnit iproute lifted-base
+         network old-locale process QuickCheck simple-sendfile stm
+         streaming-commons text time transformers unix unix-compat vault wai
+         word8
        ];
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
@@ -135057,14 +135170,14 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.0.4.2";
-       sha256 = "070bq28mg29yw5w7n92j73b74amqxn0yb5cx9z28p8ilmx3y03v1";
+       version = "3.1.0";
+       sha256 = "1790hl3a327fv01w2shdslylmhp5zv0bh7ljhymipr5vpjwjknrz";
        buildDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
        ];
        homepage = "http://github.com/yesodweb/wai";
-       description = "HTTP over SSL/TLS support for Warp via the TLS package";
+       description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -138977,6 +139090,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yamlkeysdiff" = callPackage
+    ({ mkDerivation, base, containers, parsec, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "yamlkeysdiff";
+       version = "0.5.1";
+       sha256 = "13s5qiydxcwpp0j8xap556yrlmqs7bsi62ql2c9clr4hpbw8may7";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base containers parsec text unordered-containers yaml
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/acatton/yamlkeysdiff";
+       description = "Compares the keys from two yaml files";
+       license = "unknown";
+     }) {};
+
   "yampa-canvas" = callPackage
     ({ mkDerivation, base, blank-canvas, stm, text, time, Yampa }:
      mkDerivation {
@@ -139395,8 +139527,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-fb";
-       version = "1.6.6";
-       sha256 = "00pk5vridic77laydkfhrixfv50ps7f15dxvcd44cn0z8s2d3y74";
+       version = "1.7";
+       sha256 = "1kp4vka9sjij8zyp15vj1jkaqwgy483q2gjb5wmhlqwcyp843h02";
        buildDepends = [
          aeson base bytestring conduit fb http-conduit lifted-base
          shakespeare text time transformers wai yesod-auth yesod-core
@@ -139465,6 +139597,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-auth-ldap-mediocre" = callPackage
+    ({ mkDerivation, aeson, base, LDAP, text, yesod-auth, yesod-core
+     , yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-auth-ldap-mediocre";
+       version = "0.1.0.0";
+       sha256 = "03pij218i9lk79n02c2pfrxsxyqi6lzjn5bzg7zgk5a87b6b57jh";
+       buildDepends = [
+         aeson base LDAP text yesod-auth yesod-core yesod-form
+       ];
+       jailbreak = true;
+       description = "Very simlple LDAP auth for yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-auth-oauth" = callPackage
     ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base
      , text, transformers, yesod-auth, yesod-core, yesod-form
@@ -139570,8 +139718,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.12";
-       sha256 = "12rvzds8ww2szq7r6pyc9kf287v2i5q8n318wy4x4jr3xhw0szy7";
+       version = "1.4.13";
+       sha256 = "0rqwmvl2pl05fp7xyfcpmpjkki8ww47rhifcclasaxvj109hvj1k";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -139974,8 +140122,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-mangopay";
-       version = "1.11.2";
-       sha256 = "1jyn38q0q4s4lrnw93yzvnn49js4jf6zhq8wb7whyxks1jbkjxbv";
+       version = "1.11.4";
+       sha256 = "0syg5a0xihrdbclsrbgqgf6llhji7zdn1g50fbvlklfpw4dkb1f7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -140446,10 +140594,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-static";
-       version = "1.5.0";
-       revision = "1";
-       sha256 = "1i95c43hlks1wclhwal9yr1pasmz78ddi7wzjhg9k5w21hrkcp92";
-       editedCabalFile = "d01c0a6fcb4ae005dea0c4898fd1ad452cde5e1989c90e62309c481cd0ff36c3";
+       version = "1.5.0.1";
+       sha256 = "1yda1m7dafcmq9s2gv0cdq3kphl5gg1279crqjgf3x57dyrypjpl";
        buildDepends = [
          async attoparsec base base64-bytestring blaze-builder byteable
          bytestring conduit conduit-extra containers cryptohash
@@ -140504,8 +140650,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "1.0.1";
-       sha256 = "0ixypahxrm23pahjq972r8kc4h2a14fidf1cx3wiip8wxfhc9jsi";
+       version = "1.0.2";
+       sha256 = "0rrc9cfjl1g8if0ncs2xzpb1hnaa4hi3w62q16gwir0l79vfj7b9";
        buildDepends = [ base containers contravariant text yesod-core ];
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
@@ -140655,8 +140801,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-websockets";
-       version = "0.2.2";
-       sha256 = "1qs7rxf9maa6mgyhqqkbbcg1ab55xkixpyn3216bhbbwq730kfp5";
+       version = "0.2.3";
+       sha256 = "15kklk4wkxclrmsvwzjcy8ggal14c6nrckfn0kqcrfp0hbxzj09m";
        buildDepends = [
          async base conduit enclosed-exceptions monad-control transformers
          wai wai-websockets websockets yesod-core

From b49b2d9bbabad1a2e0b08cee178258a84db83ee7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 20:12:31 +0200
Subject: [PATCH 111/123] haskell-shelly: test suite has been fixed upstream

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 72faf888486..6a4680d4906 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -895,7 +895,4 @@ self: super: {
   # https://ghc.haskell.org/trac/ghc/ticket/9825
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
 
-  # https://github.com/yesodweb/Shelly.hs/issues/105
-  shelly = dontCheck super.shelly;
-
 }

From 867eda32ca28b1dca1cea3e6fa6af868d5e39029 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 20:33:26 +0200
Subject: [PATCH 112/123] haskell-Southpaw cannot be built on Unix.

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6a4680d4906..491bf5cf200 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -870,6 +870,7 @@ self: super: {
   # This package can't be built on non-Windows systems.
   Win32 = overrideCabal super.Win32 (drv: { broken = !pkgs.stdenv.isCygwin; });
   inline-c-win32 = dontDistribute super.inline-c-win32;
+  Southpaw = dontDistribute super.Southpaw;
 
   # Doesn't work with recent versions of mtl.
   cron-compat = markBroken super.cron-compat;

From 54d86f86fdbfe4efbf83f015bbf6cbdde3a2c158 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Jul 2015 20:34:23 +0200
Subject: [PATCH 113/123] haskell-base: update override for new version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 491bf5cf200..5260d508ab1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -221,7 +221,7 @@ self: super: {
       });
 
   # Does not compile: "fatal error: ieee-flpt.h: No such file or directory"
-  base_4_8_0_0 = markBroken super.base_4_8_0_0;
+  base_4_8_1_0 = markBroken super.base_4_8_1_0;
 
   # Obsolete: https://github.com/massysett/prednote/issues/1.
   prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test;

From 9bedb70520f87e6b8f2beacbf2a09ac457da56c8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 25 Jul 2015 13:34:34 +0200
Subject: [PATCH 114/123] man-pages: 4.00 -> 4.01

---
 pkgs/data/documentation/man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 14cd41adbec..71fca096c58 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
-let version = "4.00"; in
+let version = "4.01"; in
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "18zb1g12s15sanffh0sykmmyx0j176pp7q1xxs0gk0imgvmn8hj4";
+    sha256 = "116jp2rnsdlnb3cwnbfp0g053frcmchndwyrj714swl1lgabb56i";
   };
 
   makeFlags = "MANDIR=$(out)/share/man";

From 80533a50431e555369fa9574ce222b2a912bda5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 26 Jul 2015 00:13:27 +0200
Subject: [PATCH 115/123] iproute: 4.0.0 -> 4.1.1

---
 pkgs/os-specific/linux/iproute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 53812a71286..15e25861f27 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "iproute2-4.0.0";
+  name = "iproute2-4.1.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "0616cg6liyysfddf6d8i4vyndd9b0hjmfw35icq8p18b0nqnxl2w";
+    sha256 = "0vz6m2k6hdrjlg4x0r3cd75lg9ysmndbsp35pm8494zvksc7l1vk";
   };
 
   patch = [ ./vpnc.patch ];

From 4de0d7def5805433261f5d171480c90824d9f9e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jul 2015 09:36:13 +0200
Subject: [PATCH 116/123] libdmtx: remove imagemagick dependency, /cc #8990

I found no reason for the dependency at all, and it was even propagated.
Neither Debian nor Arch have any kind of it.
---
 pkgs/development/libraries/libdmtx/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix
index 8d7049dc29a..26cf2c023eb 100644
--- a/pkgs/development/libraries/libdmtx/default.nix
+++ b/pkgs/development/libraries/libdmtx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, imagemagick }:
+{ stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libdmtx-0.7.4";
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ imagemagick ];
-
   meta = {
     description = "An open source software for reading and writing Data Matrix barcodes";
     homepage = http://libdmtx.org;

From 761fc1a45722898e05be5a960eb19432a506b639 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 11:53:43 +0200
Subject: [PATCH 117/123] Remove tabs

---
 pkgs/applications/editors/emacs-24/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 5d6d576af8e..487fccfa90d 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -7,8 +7,8 @@
 , withGTK2 ? true, gtk2
 }:
 
-assert (libXft != null) -> libpng != null;	# probably a bug
-assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
+assert (libXft != null) -> libpng != null;      # probably a bug
+assert stdenv.isDarwin -> libXaw != null;       # fails to link otherwise
 assert withGTK2 -> withX || stdenv.isDarwin;
 assert withGTK3 -> withX || stdenv.isDarwin;
 assert withGTK2 -> !withGTK3 && gtk2 != null;

From d7e97e07a32a24af5d104757fa563e46c370cbfe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 11:54:16 +0200
Subject: [PATCH 118/123] librsvg: Disable GTK+ 3 dependency

GTK+ 2 is still our default, so packages should generally not depend
on GTK+ 3. For instance, this causes Emacs to depend on both GTK+ 2
and 3, which is obviously a bad thing.

Issue #8990.
---
 pkgs/development/libraries/librsvg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 4c22c988c79..ea1910733e7 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
+{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
 , bzip2, libcroco, libintlOrEmpty
-, gtk3 ? null
+, withGTK ? false, gtk3 ? null
 , gobjectIntrospection ? null, enableIntrospection ? false }:
 
 # no introspection by default, it's too big
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]
     ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ];
 
-  propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ];
+  propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
   nativeBuildInputs = [ pkgconfig ];
 

From 1a4bb0ef9b4abc14325541ce2f145c364838de12 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 11:58:51 +0200
Subject: [PATCH 119/123] libbluray: Don't depend on the JDK by default

Depending on the JDK increases the closure size by a few hundred MB.

Issue #8990.
---
 pkgs/development/libraries/libbluray/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index de0fa1a56d3..a7a8e7cea63 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook
-, withJava ? true, jdk ? null, ant ? null
+, withJava ? false, jdk ? null, ant ? null
 , withAACS ? false, libaacs ? null
 , withBDplus ? false, libbdplus ? null
 , withMetadata ? true, libxml2 ? null

From 9ca034f277209aad437e169ae3a555f6372328a4 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Sun, 26 Jul 2015 10:29:56 +0300
Subject: [PATCH 120/123] purple-vk-plugin: init at 40ddb6d (close #8996)

@vcunat simplified preConfigure.
---
 .../purple-vk-plugin/default.nix              | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
new file mode 100644
index 00000000000..0a96d8749ae
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchhg, pidgin, cmake, libxml2 } :
+
+let
+  version = "40ddb6d";
+in
+stdenv.mkDerivation rec {
+  name = "purple-vk-plugin-${version}";
+
+  src = fetchhg {
+    url = "https://bitbucket.org/olegoandreev/purple-vk-plugin";
+    rev = "${version}";
+    sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc";
+  };
+
+  buildInputs = [ pidgin cmake libxml2 ];
+
+  preConfigure = ''
+    sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt
+  '';
+
+  cmakeFlags = "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1";
+
+  meta = {
+    homepage = https://bitbucket.org/olegoandreev/purple-vk-plugin;
+    description = "Vk (russian social network) plugin for Pidgin / libpurple";
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7889e5c334d..4eb2e469afa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12344,6 +12344,8 @@ let
 
   purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
 
+  purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { };
+
   toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
 
   pithos = callPackage ../applications/audio/pithos {

From 5b527968bd227f59554c07b2f4ae70dfbe9b9b08 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Sun, 26 Jul 2015 10:19:44 +0300
Subject: [PATCH 121/123] pidgin-mra: init at 54b2992 (close #8996)

@vcunat made pkgconfig dependency explicit.
---
 .../pidgin-plugins/pidgin-mra/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
new file mode 100644
index 00000000000..ba7396db9d6
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, pkgconfig, pidgin } :
+
+let
+  version = "54b2992";
+in
+stdenv.mkDerivation rec {
+  name = "pidgin-mra-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/dreadatour/pidgin-mra";
+    rev = "${version}";
+    sha256 = "1nhfx9gi5lhh2xjr9rw600bb53ly2nwiqq422vc0f297qkm1q9y0";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ pidgin ];
+
+  preConfigure = ''
+    sed -i 's|-I/usr/include/libpurple|$(shell pkg-config --cflags purple)|' Makefile
+    export DESTDIR=$out
+    export LIBDIR=/lib
+    export DATADIR=/share
+  '';
+
+  meta = {
+    homepage = https://github.com/dreadatour/pidgin-mra;
+    description = "Mail.ru Agent plugin for Pidgin / libpurple";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4eb2e469afa..35e643963f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12336,6 +12336,8 @@ let
 
   pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { };
 
+  pidgin-mra = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-mra { };
+
   pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { };
 
   pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { };

From 61f1594378103cd334267d382d941b59730f6871 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sun, 26 Jul 2015 16:05:50 +0200
Subject: [PATCH 122/123] libraw: fix version number (0.16.1 -> 0.16.0)

The last commit that touched this library updated the version number but
not the hash. I opted into fixing the version number rather than the
hash because actually updating libraw into version 0.16.1 or later
causes a build failure in libkdcraw and therefore breaks gwenview (which
is one of the main KDE apps).
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 3e0d2348a50..d272ad18492 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.16.1";
+  version = "0.16.0";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = { 
+  meta = {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
     homepage = http://www.libraw.org/;
     license = stdenv.lib.licenses.gpl2Plus;

From 3322c96a361c296fab2366b41e086a924f4baa81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Jul 2015 17:47:04 +0200
Subject: [PATCH 123/123] dejavu-fonts: don't install the fonts twice :-S

---
 pkgs/data/fonts/dejavu-fonts/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 21028ee0b32..728cb444539 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -30,13 +30,11 @@ stdenv.mkDerivation rec {
     ln -s ${unicodeData} resources/UnicodeData.txt
     ln -s ${blocks} resources/Blocks.txt
   '';
-  installPhase = '' 
+  installPhase = ''
     mkdir -p $out/share/fonts/truetype
-    for i in $(find build -name '*.ttf'); do 
-        cp $i $out/share/fonts/truetype; 
+    for i in $(find build -name '*.ttf'); do
+        cp $i $out/share/fonts/truetype;
     done;
-    mkdir -p $out/share/dejavu-fonts
-    cp -r build/* $out/share/dejavu-fonts
   '';
 }
-  
+