From 9c22cd380cce15f624d4e1b2d953c49304a46a1d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 27 Sep 2015 20:31:17 -0700
Subject: [PATCH 001/130] calibre-server service: init

---
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/misc/calibre-server.nix  | 77 +++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 nixos/modules/services/misc/calibre-server.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0d2700a126f..de9a318fdd2 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -234,6 +234,7 @@
       #lxd = 210; # unused
       kibana = 211;
       xtreemfs = 212;
+      calibre-server = 213;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -446,6 +447,7 @@
       lxd = 210; # unused
       #kibana = 211;
       xtreemfs = 212;
+      calibre-server = 213;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c890eac4991..9f21ffb99af 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -187,6 +187,7 @@
   ./services/misc/apache-kafka.nix
   #./services/misc/autofs.nix
   ./services/misc/canto-daemon.nix
+  ./services/misc/calibre-server.nix
   ./services/misc/cpuminer-cryptonight.nix
   ./services/misc/cgminer.nix
   ./services/misc/confd.nix
diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix
new file mode 100644
index 00000000000..a59e68edd84
--- /dev/null
+++ b/nixos/modules/services/misc/calibre-server.nix
@@ -0,0 +1,77 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.calibre-server;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.calibre-server = {
+
+      enable = mkEnableOption "calibre-server";
+
+      libraryDir = mkOption {
+        default = "/tmp/calibre-server";
+        description = ''
+          The directory where the Calibre library to serve is.
+          '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "calibre-server";
+        description = "User account under which calibre-server runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "calibre-server";
+        description = "Group account under which calibre-server runs.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.calibre-server =
+      {
+        description = "calibre-server, an OPDS server for a Calibre library";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          User = "${cfg.user}";
+          Restart = "always";
+          ExecStart = "${pkgs.calibre}/bin/calibre-server --with-library=${cfg.libraryDir}";
+        };
+
+      };
+
+    environment.systemPackages = [ pkgs.calibre ];
+
+    users.extraUsers = optionalAttrs (cfg.user == "calibre-server") (singleton
+      { name = "calibre-server";
+        group = cfg.group;
+        uid = config.ids.uids.calibre-server;
+      });
+
+    users.extraGroups = optionalAttrs (cfg.group == "calibre-server") (singleton
+      { name = "calibre-server";
+        gid = config.ids.gids.calibre-server;
+      });
+
+  };
+
+}

From a41d07074d3934aa25bedb5d7e67983f5179a91d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 3 Oct 2015 05:48:46 -0700
Subject: [PATCH 002/130] calibre-server service: configuration improvements

based on @eldostra feedback:
* remove user and group configuration, because it is probably
  unnecessary
* remove libraryDir default
* capitalize and shorten service description
---
 .../modules/services/misc/calibre-server.nix  | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix
index a59e68edd84..b8648770ff4 100644
--- a/nixos/modules/services/misc/calibre-server.nix
+++ b/nixos/modules/services/misc/calibre-server.nix
@@ -19,24 +19,11 @@ in
       enable = mkEnableOption "calibre-server";
 
       libraryDir = mkOption {
-        default = "/tmp/calibre-server";
         description = ''
           The directory where the Calibre library to serve is.
           '';
       };
 
-      user = mkOption {
-        type = types.str;
-        default = "calibre-server";
-        description = "User account under which calibre-server runs.";
-      };
-
-      group = mkOption {
-        type = types.str;
-        default = "calibre-server";
-        description = "Group account under which calibre-server runs.";
-      };
-
     };
 
   };
@@ -48,11 +35,11 @@ in
 
     systemd.services.calibre-server =
       {
-        description = "calibre-server, an OPDS server for a Calibre library";
+        description = "Calibre Server";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
-          User = "${cfg.user}";
+          User = "calibre-server";
           Restart = "always";
           ExecStart = "${pkgs.calibre}/bin/calibre-server --with-library=${cfg.libraryDir}";
         };
@@ -61,16 +48,14 @@ in
 
     environment.systemPackages = [ pkgs.calibre ];
 
-    users.extraUsers = optionalAttrs (cfg.user == "calibre-server") (singleton
-      { name = "calibre-server";
-        group = cfg.group;
+    users.extraUsers.calibre-server = {
         uid = config.ids.uids.calibre-server;
-      });
+        group = "calibre-server";
+      };
 
-    users.extraGroups = optionalAttrs (cfg.group == "calibre-server") (singleton
-      { name = "calibre-server";
+    users.extraGroups.calibre-server = {
         gid = config.ids.gids.calibre-server;
-      });
+      };
 
   };
 

From 9424238d143ce9dcdb82066fdc78bb90da460c50 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 19 Oct 2015 11:48:43 +0300
Subject: [PATCH 003/130] nginx: factor out modules in a separate file

---
 pkgs/servers/http/nginx/default.nix  | 113 ++-------------------------
 pkgs/servers/http/nginx/modules.nix  | 101 ++++++++++++++++++++++++
 pkgs/servers/http/nginx/unstable.nix |  89 +++------------------
 pkgs/top-level/all-packages.nix      |  14 ++--
 4 files changed, 127 insertions(+), 190 deletions(-)
 create mode 100644 pkgs/servers/http/nginx/modules.nix

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 54f4e1599b8..f6b4771e951 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,16 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
-, gd, geoip, luajit
-, curl, apr, aprutil, apacheHttpd, yajl, libcap, modsecurity_standalone
-, rtmp ? false
-, fullWebDAV ? false
-, syslog ? false
-, moreheaders ? false
-, echo ? false
-, modsecurity ? false
-, ngx_lua ? modsecurity || false
-, set_misc ? false
-, fluent ? false
-, extraModules ? []
+, gd, geoip
+, modules ? []
 }:
 
 with stdenv.lib;
@@ -22,72 +12,6 @@ let
     sha256 = "1mgkkmmwkhmpn68sdvbd73ssv6lpqhh864fsyvc1ij4hk4is3k13";
   };
 
-  rtmp-ext = fetchFromGitHub {
-    owner = "arut";
-    repo = "nginx-rtmp-module";
-    rev = "v1.1.7";
-    sha256 = "0i0fa1znkj7cipy5nlkw4k40klhp9jzk28wxy2vrvd2jvh91x3ma";
-  };
-
-  dav-ext = fetchFromGitHub {
-    owner = "arut";
-    repo = "nginx-dav-ext-module";
-    rev = "v0.0.3";
-    sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91";
-  };
-
-  syslog-ext = fetchFromGitHub {
-    owner = "yaoweibin";
-    repo = "nginx_syslog_patch";
-    rev = "3ca5ba65541637f74467038aa032e2586321d0cb";
-    sha256 = "0y8dxkx8m1jw4v5zsvw1gfah9vh3ryq0hfmrcbjzcmwp5b5lb1i8";
-  };
-
-  moreheaders-ext = fetchFromGitHub {
-    owner = "openresty";
-    repo = "headers-more-nginx-module";
-    rev = "v0.26";
-    sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn";
-  };
-
-  modsecurity-ext = modsecurity_standalone.nginx;
-
-  echo-ext = fetchFromGitHub {
-    owner = "openresty";
-    repo = "echo-nginx-module";
-    rev = "v0.57";
-    sha256 = "1q0f0zprcn0ypl2qh964cq186l3f40p0z7n7x22m8cxj367vf000";
-  };
-
-  lua-ext = fetchFromGitHub {
-    owner = "openresty";
-    repo = "lua-nginx-module";
-    rev = "v0.9.16";
-    sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp";
-  };
-
-  set-misc-ext = fetchFromGitHub {
-    owner = "openresty";
-    repo = "set-misc-nginx-module";
-    rev = "v0.28";
-    sha256 = "1vixj60q0liri7k5ax85grj7q9vvgybkx421bwphbhai5xrjip96";
-  };
-
-  fluentd = fetchFromGitHub {
-    owner = "fluent";
-    repo = "nginx-fluentd-module";
-    rev = "8af234043059c857be27879bc547c141eafd5c13";
-    sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm";
-  };
-
-  develkit-ext = fetchFromGitHub {
-    owner = "simpl";
-    repo = "ngx_devel_kit";
-    rev = "v0.2.19";
-    sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
-  };
-
-
 in
 
 stdenv.mkDerivation rec {
@@ -95,15 +19,8 @@ stdenv.mkDerivation rec {
   src = mainSrc;
 
   buildInputs =
-    [ openssl zlib pcre libxml2 libxslt gd geoip
-    ] ++ optional fullWebDAV expat
-      ++ optional ngx_lua luajit
-      ++ optionals modsecurity [ curl apr aprutil apacheHttpd yajl ];
-
-  LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else "";
-  LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else "";
-
-  patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
+    [ openssl zlib pcre libxml2 libxslt gd geoip ]
+    ++ concatMap (mod: mod.inputs or []) modules;
 
   configureFlags = [
     "--with-select_module"
@@ -130,27 +47,13 @@ stdenv.mkDerivation rec {
     "--with-ipv6"
     # Install destination problems
     # "--with-http_perl_module"
-  ] ++ optional rtmp "--add-module=${rtmp-ext}"
-    ++ optional fullWebDAV "--add-module=${dav-ext}"
-    ++ optional syslog "--add-module=${syslog-ext}"
-    ++ optional moreheaders "--add-module=${moreheaders-ext}"
-    ++ optional echo "--add-module=${echo-ext}"
-    ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}"
-    ++ optional set_misc "--add-module=${set-misc-ext}"
-    ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd))
+  ] ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd))
         [ "--with-file-aio" "--with-aio_module" ]
-    ++ optional fluent "--add-module=${fluentd}"
-    ++ optional modsecurity "--add-module=${modsecurity-ext}/nginx/modsecurity"
-    ++ (map (m: "--add-module=${m}") extraModules);
+    ++ map (mod: "--add-module=${mod.src}") modules;
 
+  NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
 
-  additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
-
-  NIX_CFLAGS_COMPILE = optionalString modsecurity "-I${aprutil}/include/apr-1 -I${apacheHttpd}/include -I${apr}/include/apr-1 -I${yajl}/include";
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
-  '';
+  preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
 
   meta = {
     description = "A reverse proxy and lightweight webserver";
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
new file mode 100644
index 00000000000..d229e88a7e4
--- /dev/null
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -0,0 +1,101 @@
+{ fetchFromGitHub, pkgs }:
+
+{
+  rtmp = {
+    src = fetchFromGitHub {
+      owner = "arut";
+      repo = "nginx-rtmp-module";
+      rev = "v1.1.7";
+      sha256 = "0i0fa1znkj7cipy5nlkw4k40klhp9jzk28wxy2vrvd2jvh91x3ma";
+    };
+  };
+
+  dav = {
+    src = fetchFromGitHub {
+      owner = "arut";
+      repo = "nginx-dav-ext-module";
+      rev = "v0.0.3";
+      sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91";
+    };
+    inputs = [ pkgs.expat ];
+  };
+
+  syslog = rec {
+    src = fetchFromGitHub {
+      owner = "yaoweibin";
+      repo = "nginx_syslog_patch";
+      rev = "3ca5ba65541637f74467038aa032e2586321d0cb";
+      sha256 = "0y8dxkx8m1jw4v5zsvw1gfah9vh3ryq0hfmrcbjzcmwp5b5lb1i8";
+    };
+    preConfigure = ''
+      patch -p1 < "${src}/syslog-1.7.0.patch"
+    '';
+  };
+
+  moreheaders = {
+    src = fetchFromGitHub {
+      owner = "openresty";
+      repo = "headers-more-nginx-module";
+      rev = "v0.26";
+      sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn";
+    };
+  };
+
+  modsecurity = {
+    src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity";
+    inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ];
+    preConfigure = ''
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil}/include/apr-1 -I${pkgs.apacheHttpd}/include -I${pkgs.apr}/include/apr-1 -I${pkgs.yajl}/include"
+    '';
+  };
+
+  echo = {
+    src = fetchFromGitHub {
+      owner = "openresty";
+      repo = "echo-nginx-module";
+      rev = "v0.57";
+      sha256 = "1q0f0zprcn0ypl2qh964cq186l3f40p0z7n7x22m8cxj367vf000";
+    };
+  };
+
+  develkit = {
+    src = fetchFromGitHub {
+      owner = "simpl";
+      repo = "ngx_devel_kit";
+      rev = "v0.2.19";
+      sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
+    };
+  };
+
+  lua = {
+    src = fetchFromGitHub {
+      owner = "openresty";
+      repo = "lua-nginx-module";
+      rev = "v0.9.16";
+      sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp";
+    };
+    inputs = [ pkgs.luajit ];
+    preConfigure = ''
+      export LUAJIT_LIB="${pkgs.luajit}/lib"
+      export LUAJIT_INC="${pkgs.luajit}/include/luajit-2.0"
+    '';
+  };
+
+  set-misc = {
+    src = fetchFromGitHub {
+      owner = "openresty";
+      repo = "set-misc-nginx-module";
+      rev = "v0.28";
+      sha256 = "1vixj60q0liri7k5ax85grj7q9vvgybkx421bwphbhai5xrjip96";
+    };
+  };
+
+  fluentd = {
+    src = fetchFromGitHub {
+      owner = "fluent";
+      repo = "nginx-fluentd-module";
+      rev = "8af234043059c857be27879bc547c141eafd5c13";
+      sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm";
+    };
+  };
+}
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index e71adba3e57..45129dbe0d3 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -1,12 +1,8 @@
 { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
-, gd, geoip, luajit
-, rtmp ? false
-, fullWebDAV ? false
-, syslog ? false
-, moreheaders ? false
-, echo ? false
-, ngx_lua ? false
-, withStream ? false }:
+, gd, geoip
+, withStream ? false
+, modules ? []
+}:
 
 with stdenv.lib;
 
@@ -17,55 +13,6 @@ let
     sha256 = "1a1bixw2a4s5c3qzw3583s4a4y6i0sdzhihhlbab5rkyfh1hr6s7";
   };
 
-  rtmp-ext = fetchFromGitHub {
-    owner = "arut";
-    repo = "nginx-rtmp-module";
-    rev = "v1.1.5";
-    sha256 = "1d9ws4prxz22yq3nhh5h18jrs331zivrdh784l6wznc1chg3gphn";
-  };
-
-  dav-ext = fetchFromGitHub {
-    owner = "arut";
-    repo = "nginx-dav-ext-module";
-    rev = "v0.0.3";
-    sha256 = "1qck8jclxddncjad8yv911s9z7lrd58bp96jf13m0iqk54xghx91";
-  };
-
-  syslog-ext = fetchFromGitHub {
-    owner = "yaoweibin";
-    repo = "nginx_syslog_patch";
-    rev = "v0.25";
-    sha256 = "0734f884838wcjyrrddn8wzj834wid1zffrk093jrx18447cryxl";
-  };
-
-  moreheaders-ext = fetchFromGitHub {
-    owner = "openresty";
-    repo = "headers-more-nginx-module";
-    rev = "v0.25";
-    sha256 = "1d71y1i0smi4gkzz731fhn58gr03b3s6jz6ipnfzxxaizmgxm3rb";
-  };
-
-  echo-ext = fetchFromGitHub {
-    owner = "openresty";
-    repo = "echo-nginx-module";
-    rev = "v0.56";
-    sha256 = "03vaf1ffhkj2s089f90h45n079h3zw47h6y5zpk752f4ydiagpgd";
-  };
-
-  develkit-ext = fetchFromGitHub {
-    owner = "simpl";
-    repo = "ngx_devel_kit";
-    rev = "v0.2.19";
-    sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
-  };
-
-  lua-ext = fetchFromGitHub {
-    owner = "openresty";
-    repo = "lua-nginx-module";
-    rev = "v0.9.16";
-    sha256 = "0dvdam228jhsrayb22ishljdkgib08bakh8ygn84sq0c2xbidzlp";
-  };
-
 in
 
 stdenv.mkDerivation rec {
@@ -73,14 +20,8 @@ stdenv.mkDerivation rec {
   src = mainSrc;
 
   buildInputs =
-    [ openssl zlib pcre libxml2 libxslt gd geoip
-    ] ++ optional fullWebDAV expat
-      ++ optional ngx_lua luajit;
-
-  LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else "";
-  LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else "";
-
-  patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
+    [ openssl zlib pcre libxml2 libxslt gd geoip ]
+    ++ concatMap (mod: mod.inputs or []) modules;
 
   configureFlags = [
     "--with-http_ssl_module"
@@ -104,21 +45,13 @@ stdenv.mkDerivation rec {
     "--with-ipv6"
     # Install destination problems
     # "--with-http_perl_module"
-  ] ++ optional rtmp "--add-module=${rtmp-ext}"
-    ++ optional fullWebDAV "--add-module=${dav-ext}"
-    ++ optional syslog "--add-module=${syslog-ext}"
-    ++ optional moreheaders "--add-module=${moreheaders-ext}"
-    ++ optional echo "--add-module=${echo-ext}"
-    ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}"
-    ++ optional withStream "--with-stream"
-    ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";
+  ] ++ optional withStream "--with-stream"
+    ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
+    ++ map (mod: "--add-module=${mod.src}") modules;
 
+  NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
 
-  additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations";
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
-  '';
+  preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
 
   postInstall = ''
     mv $out/sbin $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebcfb57952d..2b591551dd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9093,17 +9093,17 @@ let
   neard = callPackage ../servers/neard { };
 
   nginx = callPackage ../servers/http/nginx {
-    rtmp        = true;
-    fullWebDAV  = true;
-    syslog      = false; # the patch is not found
-    moreheaders = true;
+    # We don't use `with` statement here on purpose!
+    # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
+    modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
   };
+
   nginxUnstable = callPackage ../servers/http/nginx/unstable.nix {
-    fullWebDAV  = true;
-    syslog      = false; # the patch is not found
-    moreheaders = true;
+    modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
   };
 
+  nginxModules = callPackage ../servers/http/nginx/modules.nix { };
+
   ngircd = callPackage ../servers/irc/ngircd { };
 
   nix-binary-cache = callPackage ../servers/http/nix-binary-cache {};

From d2fc6e6a0245d3e9583b4d57f2bcaead6154cb97 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 19 Oct 2015 11:49:03 +0300
Subject: [PATCH 004/130] nginxModules.pam: init at 1.4

---
 pkgs/servers/http/nginx/modules.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index d229e88a7e4..c61bb0ca51e 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -98,4 +98,14 @@
       sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm";
     };
   };
+
+  pam = {
+    src = fetchFromGitHub {
+      owner = "stogh";
+      repo = "ngx_http_auth_pam_module";
+      rev = "v1.4";
+      sha256 = "068zwyrc1dji55rlaj2kx6n0v2n5rpj7nz26ipvz26ida712md35";
+    };
+    inputs = [ pkgs.pam ];
+  };
 }

From 3b6cb81e356fc04648bd7fc2b0390491cb6eb0ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 30 Oct 2015 14:40:53 +0100
Subject: [PATCH 005/130] python nbconvert: 4.0.0 -> 4.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 292b758b5c0..b49a3bb8d91 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9368,12 +9368,12 @@ let
   };
 
   nbconvert = buildPythonPackage rec {
-    version = "4.0.0";
+    version = "4.1.0";
     name = "nbconvert-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/nbconvert/${name}.tar.gz";
-      sha256 = "472ad15d1a71f1ef00c4094c11bb93638858fc89fb2c5838b3aa6b67d981b437";
+      sha256 = "e0296e45293dd127d028f678e3b6aba3f1db3283a134178bdb49eea402d4cf1c";
     };
 
     buildInputs = with self; [nose];

From 858f67d74450541974994df2f52594debbdc5dbe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 30 Oct 2015 14:41:05 +0100
Subject: [PATCH 006/130] python tabulate: init at 0.7.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b49a3bb8d91..7e96b146fb0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16665,6 +16665,29 @@ let
   #   doCheck = false;
   # };
 
+  tabulate = buildPythonPackage rec {
+    version = "0.7.5";
+    name = "tabulate-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/tabulate/${name}.tar.gz";
+      sha256 = "9071aacbd97a9a915096c1aaf0dc684ac2672904cd876db5904085d6dac9810e";
+    };
+
+    buildInputs = with self; [ nose ];
+
+    # Tests: cannot import common (relative import).
+    doCheck = false;
+
+    meta = {
+      description = "Pretty-print tabular data";
+      homepage = https://bitbucket.org/astanin/python-tabulate;
+      license = licenses.mit;
+      maintainer = with maintainers; [ fridh ];
+    };
+
+  };
+
   targetcli_fb = buildPythonPackage rec {
     version = "2.1.fb33";
     name = "targetcli-fb-${version}";

From d4f643c8458a7a2ae3465a2694114293947ac670 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <michiel@staff.isoc.nl>
Date: Sat, 31 Oct 2015 00:34:20 +0100
Subject: [PATCH 007/130] Armagetronad: init at version 0.2.8.3.3

---
 pkgs/games/armagetronad/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/games/armagetronad/default.nix

diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
new file mode 100644
index 00000000000..e70d4c7b596
--- /dev/null
+++ b/pkgs/games/armagetronad/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, mesa, zlib} :
+
+let
+  versionMajor = "0.2.8";
+  versionMinor = "3.3";
+  version = "${versionMajor}.${versionMinor}";
+in
+
+stdenv.mkDerivation {
+  name = "armagetron-${version}";
+  src = fetchurl {
+    url = "https://launchpad.net/armagetronad/${versionMajor}/0.2.8.3.x/+download/armagetronad-${version}.src.tar.bz2";
+    sha256 = "1s55irhg60fpmhy8wwxpdq7c45r1mqch6zpicyb2wf9ln60xgwnx";
+  };
+
+  NIX_LDFLAGS = "-lSDL_image";
+
+  configureFlags ="--disable-etc";
+  buildInputs = [SDL SDL_image libxml2 libjpeg mesa zlib];
+
+  meta = {
+    homepage = http://armagetronad.org;
+    description = "An multiplayer networked arcade racing game in 3D similar to Tron";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c4ae620eca..68d25293f5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13711,6 +13711,8 @@ let
 
   anki = callPackage ../games/anki { };
 
+  armagetronad = callPackage ../games/armagetronad { };
+
   asc = callPackage ../games/asc {
     lua = lua5_1;
     libsigcxx = libsigcxx12;

From c37982540e030f67edede5564be537f2d15c21b1 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <michiel@staff.isoc.nl>
Date: Sat, 31 Oct 2015 01:16:09 +0100
Subject: [PATCH 008/130] Reordered games in all-packages.nix to GAMES section

---
 pkgs/top-level/all-packages.nix | 204 ++++++++++++++++----------------
 1 file changed, 103 insertions(+), 101 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c4ae620eca..102561e2188 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -488,8 +488,6 @@ let
 
   actkbd = callPackage ../tools/system/actkbd { };
 
-  adom = callPackage ../games/adom { };
-
   advancecomp = callPackage ../tools/compression/advancecomp {};
 
   aefs = callPackage ../tools/filesystems/aefs { };
@@ -659,14 +657,10 @@ let
 
   badvpn = callPackage ../tools/networking/badvpn {};
 
-  banner = callPackage ../games/banner {};
-
   barcode = callPackage ../tools/graphics/barcode {};
 
   bashmount = callPackage ../tools/filesystems/bashmount {};
 
-  bastet = callPackage ../games/bastet {};
-
   bc = callPackage ../tools/misc/bc { };
 
   bdf2psf = callPackage ../tools/misc/bdf2psf { };
@@ -793,14 +787,6 @@ let
 
   cpulimit = callPackage ../tools/misc/cpulimit { };
 
-  crawlTiles = callPackage ../games/crawl { };
-
-  crawl = callPackage ../games/crawl {
-    tileMode = false;
-  };
-
-  cuyo = callPackage ../games/cuyo { };
-
   contacts = callPackage ../tools/misc/contacts { };
 
   datamash = callPackage ../tools/misc/datamash { };
@@ -1045,8 +1031,6 @@ let
 
   chkrootkit = callPackage ../tools/security/chkrootkit { };
 
-  chocolateDoom = callPackage ../games/chocolate-doom { };
-
   chrony = callPackage ../tools/networking/chrony { };
 
   chunkfs = callPackage ../tools/filesystems/chunkfs { };
@@ -1394,8 +1378,6 @@ let
 
   ethtool = callPackage ../tools/misc/ethtool { };
 
-  eternity = callPackage ../games/eternity-engine { };
-
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };
 
   euca2ools = callPackage ../tools/virtualization/euca2ools { };
@@ -1808,8 +1790,6 @@ let
 
   haveged = callPackage ../tools/security/haveged { };
 
-  hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
-
   hardlink = callPackage ../tools/system/hardlink { };
 
   hashcat = callPackage ../tools/security/hashcat { };
@@ -2020,8 +2000,6 @@ let
 
   kippo = callPackage ../servers/kippo { };
 
-  klavaro = callPackage ../games/klavaro {};
-
   kzipmix = callPackage_i686 ../tools/compression/kzipmix { };
 
   makebootfat = callPackage ../tools/misc/makebootfat { };
@@ -2231,16 +2209,6 @@ let
 
   mgba = callPackage ../misc/emulators/mgba { };
 
-  minecraft = callPackage ../games/minecraft {
-    useAlsa = config.minecraft.alsa or false;
-  };
-
-  minecraft-server = callPackage ../games/minecraft-server { };
-
-  minetest = callPackage ../games/minetest {
-    libpng = libpng12;
-  };
-
   minissdpd = callPackage ../tools/networking/minissdpd { };
 
   miniupnpc = callPackage ../tools/networking/miniupnpc { };
@@ -2482,18 +2450,12 @@ let
 
   odt2txt = callPackage ../tools/text/odt2txt { };
 
-  odamex = callPackage ../games/odamex { };
-
   offlineimap = callPackage ../tools/networking/offlineimap {
     inherit (pythonPackages) sqlite3;
   };
 
-  openarena = callPackage ../games/openarena { };
-
   opencryptoki = callPackage ../tools/security/opencryptoki { };
 
-  onscripter-en = callPackage ../games/onscripter-en { };
-
   opendbx = callPackage ../development/libraries/opendbx { };
 
   opendkim = callPackage ../development/libraries/opendkim { };
@@ -2822,8 +2784,6 @@ let
 
   rawdog = callPackage ../applications/networking/feedreaders/rawdog { };
 
-  privateer = callPackage ../games/privateer { };
-
   read-edid = callPackage ../os-specific/linux/read-edid { };
 
   redmine = callPackage ../applications/version-management/redmine { };
@@ -2960,8 +2920,6 @@ let
 
   scrot = callPackage ../tools/graphics/scrot { };
 
-  scrolls = callPackage ../games/scrolls { };
-
   scrypt = callPackage ../tools/security/scrypt { };
 
   sdcv = callPackage ../applications/misc/sdcv { };
@@ -3166,8 +3124,6 @@ let
 
   tboot = callPackage ../tools/security/tboot { };
 
-  tcl2048 = callPackage ../games/tcl2048 { };
-
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   tcpflow = callPackage ../tools/networking/tcpflow { };
@@ -6204,10 +6160,6 @@ let
 
   expat = callPackage ../development/libraries/expat { };
 
-  extremetuxracer = callPackage ../games/extremetuxracer {
-    libpng = libpng12;
-  };
-
   eventlog = callPackage ../development/libraries/eventlog { };
 
   facile = callPackage ../development/libraries/facile { };
@@ -6276,8 +6228,6 @@ let
 
   filter-audio = callPackage ../development/libraries/filter-audio {};
 
-  fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
-
   flann = callPackage ../development/libraries/flann { };
 
   flite = callPackage ../development/libraries/flite { };
@@ -6329,12 +6279,8 @@ let
 
   ganv = callPackage ../development/libraries/ganv { };
 
-  gav = callPackage ../games/gav { };
-
   gcab = callPackage ../development/libraries/gcab { };
 
-  gsb = callPackage ../games/gsb { };
-
   gdome2 = callPackage ../development/libraries/gdome2 {
     inherit (gnome) gtkdoc;
   };
@@ -6710,8 +6656,6 @@ let
 
   itk = callPackage ../development/libraries/itk { };
 
-  jamp = builderDefsPackage (callPackage ../games/jamp) {};
-
   jasper = callPackage ../development/libraries/jasper { };
 
   jama = callPackage ../development/libraries/jama { };
@@ -7621,10 +7565,6 @@ let
 
   liquidfun = callPackage ../development/libraries/liquidfun { };
 
-  liquidwar = builderDefsPackage (callPackage ../games/liquidwar) {
-    guile = guile_1_8;
-  };
-
   log4cpp = callPackage ../development/libraries/log4cpp { };
 
   log4cxx = callPackage ../development/libraries/log4cxx { };
@@ -7785,8 +7725,6 @@ let
     sslSupport = true;
   };
 
-  nethack = callPackage ../games/nethack { };
-
   nettle = callPackage ../development/libraries/nettle { };
 
   newt = callPackage ../development/libraries/newt { };
@@ -7867,8 +7805,6 @@ let
 
   openldap = callPackage ../development/libraries/openldap { };
 
-  openlierox = callPackage ../games/openlierox { };
-
   libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { };
 
   opencolorio = callPackage ../development/libraries/opencolorio { };
@@ -7889,8 +7825,6 @@ let
     ffmpeg = ffmpeg_0;
   };
 
-  openspades = callPackage ../games/openspades {};
-
   libressl = callPackage ../development/libraries/libressl { };
 
   boringssl = callPackage ../development/libraries/boringssl { };
@@ -8354,8 +8288,6 @@ let
 
   steghide = callPackage ../tools/security/steghide {};
 
-  stepmania = callPackage ../games/stepmania {};
-
   stlport = callPackage ../development/libraries/stlport { };
 
   strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
@@ -8471,8 +8403,6 @@ let
     gnutls = gnutls;
   });
 
-  unnethack = callPackage ../games/unnethack { };
-
   v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
     inherit (pythonPackages) gyp;
   };
@@ -8638,8 +8568,6 @@ let
     qt = qt4;
   };
 
-  zangband = builderDefsPackage (callPackage ../games/zangband) {};
-
   zeitgeist = callPackage ../development/libraries/zeitgeist { };
 
   zlib = callPackage ../development/libraries/zlib {
@@ -8837,8 +8765,6 @@ let
 
   perlcritic = perlPackages.PerlCritic;
 
-  planetary_annihilation = callPackage ../games/planetaryannihilation { };
-
   sqitchPg = callPackage ../development/tools/misc/sqitch {
     name = "sqitch-pg";
     databaseModule = perlPackages.DBDPg;
@@ -9119,8 +9045,6 @@ let
 
   freeswitch = callPackage ../servers/sip/freeswitch { };
 
-  ghostOne = callPackage ../servers/games/ghost-one { };
-
   groovebasin = callPackage ../applications/audio/groovebasin { };
 
   hbase = callPackage ../servers/hbase {};
@@ -9587,8 +9511,6 @@ let
 
   inherit (pythonPackages) bedup;
 
-  beret = callPackage ../games/beret { };
-
   bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
 
   busybox = callPackage ../os-specific/linux/busybox { };
@@ -10186,8 +10108,6 @@ let
 
   nettools = callPackage ../os-specific/linux/net-tools { };
 
-  neverball = callPackage ../games/neverball { };
-
   nftables = callPackage ../os-specific/linux/nftables { };
 
   numactl = callPackage ../os-specific/linux/numactl { };
@@ -10362,11 +10282,6 @@ let
   # FIXME: `tcp-wrapper' is actually not OS-specific.
   tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { };
 
-  trackballs = callPackage ../games/trackballs {
-    debug = false;
-    guile = guile_1_8;
-  };
-
   trinity = callPackage ../os-specific/linux/trinity { };
 
   tunctl = callPackage ../os-specific/linux/tunctl { };
@@ -10514,18 +10429,12 @@ let
     wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };
   };
 
-  wesnoth = callPackage ../games/wesnoth {
-    lua = lua5;
-  };
-
   wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
 
   wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
 
   wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
 
-  xbomb = callPackage ../games/xbomb { };
-
   xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };
 
   xf86_input_multitouch =
@@ -10535,14 +10444,8 @@ let
 
   xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { };
 
-  xmoto = callPackage ../games/xmoto { };
-
   xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
 
-  xpilot-ng = callPackage ../games/xpilot { };
-  bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {};
-  bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix {};
-
   zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
 
   zfs = callPackage ../os-specific/linux/zfs {
@@ -12360,10 +12263,6 @@ let
 
   mrxvt = callPackage ../applications/misc/mrxvt { };
 
-  mudlet = qt5Libs.callPackage ../games/mudlet {
-    inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
-  };
-
   multimarkdown = callPackage ../tools/typesetting/multimarkdown { };
 
   multimon-ng = callPackage ../applications/misc/multimon-ng { };
@@ -13703,6 +13602,8 @@ let
 
   "2048-in-terminal" = callPackage ../games/2048-in-terminal { };
 
+  adom = callPackage ../games/adom { };
+
   airstrike = callPackage ../games/airstrike { };
 
   alienarena = callPackage ../games/alienarena { };
@@ -13711,6 +13612,8 @@ let
 
   anki = callPackage ../games/anki { };
 
+  armagetronad = callPackage ../games/armagetronad { };
+
   asc = callPackage ../games/asc {
     lua = lua5_1;
     libsigcxx = libsigcxx12;
@@ -13724,6 +13627,12 @@ let
     guile = guile_1_8;
   };
 
+  banner = callPackage ../games/banner {};
+
+  bastet = callPackage ../games/bastet {};
+
+  beret = callPackage ../games/beret { };
+
   bitsnbots = callPackage ../games/bitsnbots {
     lua = lua5;
   };
@@ -13746,6 +13655,8 @@ let
 
   chessdb = callPackage ../games/chessdb { };
 
+  chocolateDoom = callPackage ../games/chocolate-doom { };
+
   cockatrice = qt5Libs.callPackage ../games/cockatrice {  };
 
   confd = goPackages.confd.bin // { outputs = [ "bin" ]; };
@@ -13764,8 +13675,16 @@ let
   crafty = callPackage ../games/crafty { };
   craftyFull = appendToName "full" (crafty.override { fullVariant = true; });
 
+  crawlTiles = callPackage ../games/crawl { };
+
+  crawl = callPackage ../games/crawl {
+    tileMode = false;
+  };
+
   crrcsim = callPackage ../games/crrcsim {};
 
+  cuyo = callPackage ../games/cuyo { };
+
   dfhack = callPackage_i686 ../games/dfhack {
     inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT;
   };
@@ -13792,10 +13711,18 @@ let
 
   egoboo = callPackage ../games/egoboo { };
 
+  eternity = callPackage ../games/eternity-engine { };
+
+  extremetuxracer = callPackage ../games/extremetuxracer {
+    libpng = libpng12;
+  };
+
   exult = callPackage ../games/exult { };
 
   fairymax = callPackage ../games/fairymax {};
 
+  fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
+
   flightgear = qt5Libs.callPackage ../games/flightgear { };
 
   freecell-solver = callPackage ../games/freecell-solver { };
@@ -13813,8 +13740,12 @@ let
     wxGTK = wxGTK28.override { unicode = false; };
   };
 
+  gav = callPackage ../games/gav { };
+
   gemrb = callPackage ../games/gemrb { };
 
+  ghostOne = callPackage ../servers/games/ghost-one { };
+
   gl117 = callPackage ../games/gl-117 {};
 
   glestae = callPackage ../games/glestae {};
@@ -13831,10 +13762,14 @@ let
 
   gnugo = callPackage ../games/gnugo { };
 
+  gsb = callPackage ../games/gsb { };
+
   gtypist = callPackage ../games/gtypist { };
 
   gzdoom = callPackage ../games/gzdoom { };
 
+  hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
+
   hedgewars = callPackage ../games/hedgewars {
     inherit (haskellPackages) ghcWithPackages;
   };
@@ -13851,6 +13786,10 @@ let
     lua = lua5;
   };
 
+  jamp = builderDefsPackage (callPackage ../games/jamp) {};
+
+  klavaro = callPackage ../games/klavaro {};
+
   kobodeluxe = callPackage ../games/kobodeluxe { };
 
   lgogdownloader = callPackage ../games/lgogdownloader { };
@@ -13859,32 +13798,64 @@ let
 
   lincity_ng = callPackage ../games/lincity/ng.nix {};
 
+  liquidwar = builderDefsPackage (callPackage ../games/liquidwar) {
+    guile = guile_1_8;
+  };
+
   mars = callPackage ../games/mars { };
 
   megaglest = callPackage ../games/megaglest {};
 
   micropolis = callPackage ../games/micropolis { };
 
+  minecraft = callPackage ../games/minecraft {
+    useAlsa = config.minecraft.alsa or false;
+  };
+
+  minecraft-server = callPackage ../games/minecraft-server { };
+
+  minetest = callPackage ../games/minetest {
+    libpng = libpng12;
+  };
+
   mnemosyne = callPackage ../games/mnemosyne {
     inherit (pythonPackages) matplotlib cherrypy sqlite3;
   };
 
+  mudlet = qt5Libs.callPackage ../games/mudlet {
+    inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
+  };
+
   n2048 = callPackage ../games/n2048 {};
 
   naev = callPackage ../games/naev { };
 
+  nethack = callPackage ../games/nethack { };
+
+  neverball = callPackage ../games/neverball { };
+
   nexuiz = callPackage ../games/nexuiz { };
 
   njam = callPackage ../games/njam { };
 
   newtonwars = callPackage ../games/newtonwars { };
 
+  odamex = callPackage ../games/odamex { };
+
   oilrush = callPackage ../games/oilrush { };
 
+  onscripter-en = callPackage ../games/onscripter-en { };
+
+  openarena = callPackage ../games/openarena { };
+
+  openlierox = callPackage ../games/openlierox { };
+
   openmw = callPackage ../games/openmw { };
 
   openra = callPackage ../games/openra { lua = lua5_1; };
 
+  openspades = callPackage ../games/openspades {};
+
   openttd = callPackage ../games/openttd {
     zlib = zlibStatic;
   };
@@ -13899,10 +13870,14 @@ let
 
   pioneers = callPackage ../games/pioneers { };
 
+  planetary_annihilation = callPackage ../games/planetaryannihilation { };
+
   pong3d = callPackage ../games/pong3d { };
 
   prboom = callPackage ../games/prboom { };
 
+  privateer = callPackage ../games/privateer { };
+
   qqwing = callPackage ../games/qqwing { };
 
   quake3demo = callPackage ../games/quake3/wrapper {
@@ -13944,6 +13919,8 @@ let
 
   scorched3d = callPackage ../games/scorched3d { };
 
+  scrolls = callPackage ../games/scrolls { };
+
   sdlmame = callPackage ../games/sdlmame { };
 
   sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { };
@@ -13975,6 +13952,8 @@ let
     withPrimus = config.steam.primus or false;
   };
 
+  stepmania = callPackage ../games/stepmania {};
+
   stuntrally = callPackage ../games/stuntrally { };
 
   superTux = callPackage ../games/super-tux { };
@@ -13983,6 +13962,8 @@ let
 
   synthv1 = callPackage ../applications/audio/synthv1 { };
 
+  tcl2048 = callPackage ../games/tcl2048 { };
+
   the-powder-toy = callPackage ../games/the-powder-toy {
     lua = lua5_1;
   };
@@ -14003,6 +13984,11 @@ let
 
   tpm = callPackage ../games/thePenguinMachine { };
 
+  trackballs = callPackage ../games/trackballs {
+    debug = false;
+    guile = guile_1_8;
+  };
+
   tremulous = callPackage ../games/tremulous { };
 
   speed_dreams = callPackage ../games/speed-dreams {
@@ -14031,6 +14017,8 @@ let
     lua = lua5;
   };
 
+  unnethack = callPackage ../games/unnethack { };
+
   unvanquished = callPackage ../games/unvanquished { };
 
   uqm = callPackage ../games/uqm { };
@@ -14059,6 +14047,10 @@ let
 
   warzone2100 = callPackage ../games/warzone2100 { };
 
+  wesnoth = callPackage ../games/wesnoth {
+    lua = lua5;
+  };
+
   widelands = callPackage ../games/widelands {
     lua = lua5_1;
   };
@@ -14071,6 +14063,8 @@ let
 
   xboard =  callPackage ../games/xboard { };
 
+  xbomb = callPackage ../games/xbomb { };
+
   xconq = callPackage ../games/xconq {
     tcl = tcl-8_5;
     tk = tk-8_5;
@@ -14079,8 +14073,14 @@ let
   # TODO: the corresponding nix file is missing
   # xracer = callPackage ../games/xracer { };
 
+  xmoto = callPackage ../games/xmoto { };
+
   xonotic = callPackage ../games/xonotic { };
 
+  xpilot-ng = callPackage ../games/xpilot { };
+  bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {};
+  bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix {};
+
   xskat = callPackage ../games/xskat { };
 
   xsnow = callPackage ../games/xsnow { };
@@ -14091,6 +14091,8 @@ let
   zandronum-server = callPackage ../games/zandronum/server.nix { };
   zandronum-bin = callPackage ../games/zandronum/bin.nix { };
 
+  zangband = builderDefsPackage (callPackage ../games/zangband) {};
+
   zdoom = callPackage ../games/zdoom { };
 
   zod = callPackage ../games/zod { };

From ca7ea493535bce79f2c778e96a37db2d9a5f5a79 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 31 Oct 2015 01:19:13 +0100
Subject: [PATCH 009/130] perl-CatalystPluginLogHandler: init at 0.08

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4bf1efef244..ae350925ad8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1144,6 +1144,20 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [CatalystRuntime HTMLWidget];
   };
 
+  CatalystPluginLogHandler = buildPerlPackage rec {
+    name = "Catalyst-Plugin-Log-Handler-0.08";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PE/PEPE/${name}.tar.gz";
+      sha256 = "0db3c3a57b4ee3d789ba5129890e2858913fef00d8185bdc9c5d7fde31e043ef";
+    };
+    propagatedBuildInputs = [ ClassAccessor LogHandler MROCompat ];
+    meta = {
+      description = "Catalyst Plugin for Log::Handler";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ stdenv.lib.maintainers.rycee ];
+    };
+  };
+
   CatalystPluginSession = buildPerlPackage {
     name = "Catalyst-Plugin-Session-0.39";
     src = fetchurl {

From 730debb8a44c41460f336883d314e6995acbfb73 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 31 Oct 2015 01:23:42 +0100
Subject: [PATCH 010/130] perl-CatalystPluginSessionDynamicExpiry: init at 0.04

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ae350925ad8..74b041e57fb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1172,6 +1172,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CatalystPluginSessionDynamicExpiry = buildPerlPackage rec {
+    name = "Catalyst-Plugin-Session-DynamicExpiry-0.04";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
+      sha256 = "7707c56734cdb1512f733dc400fadf6f4c53cb217b58207857824dad6780a079";
+    };
+    propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime MROCompat Moose namespaceautoclean ];
+    meta = {
+      description = "Per-session custom expiry times";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ stdenv.lib.maintainers.rycee ];
+    };
+  };
+
   CatalystPluginSessionStateCookie = buildPerlPackage rec {
     name = "Catalyst-Plugin-Session-State-Cookie-0.17";
     src = fetchurl {

From e6873044ac920a32e66416de1e93adde8ba5e95e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 31 Oct 2015 01:24:12 +0100
Subject: [PATCH 011/130] perl-CatalystPluginSessionStoreFile: init at 0.18

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 74b041e57fb..a40dc786fcd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1212,6 +1212,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CatalystPluginSessionStoreFile = buildPerlPackage rec {
+    name = "Catalyst-Plugin-Session-Store-File-0.18";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz";
+      sha256 = "54738e3ce76f8be8b66947092d28973c73d79d1ee19b5d92b057552f8ff09b4f";
+    };
+    propagatedBuildInputs = [ CacheCache CatalystPluginSession CatalystRuntime ClassDataInheritable MROCompat ];
+    meta = {
+      description = "File storage backend for session data";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ stdenv.lib.maintainers.rycee ];
+    };
+  };
+
   CatalystPluginStackTrace = buildPerlPackage {
     name = "Catalyst-Plugin-StackTrace-0.12";
     src = fetchurl {

From a0bf01d5c109246c02254804ab93d4f9851ae582 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 31 Oct 2015 01:24:23 +0100
Subject: [PATCH 012/130] perl-CatalystPluginStatusMessage: init at 1.002000

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a40dc786fcd..f35babc840c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1254,6 +1254,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CatalystPluginStatusMessage = buildPerlPackage rec {
+    name = "Catalyst-Plugin-StatusMessage-1.002000";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/H/HK/HKCLARK/${name}.tar.gz";
+      sha256 = "649c894ab16f9f48ada8f9cc599a7ecbb8891ab3761ff6fd510520c6de407c1f";
+    };
+    propagatedBuildInputs = [ CatalystRuntime SubName strictures ];
+    meta = {
+      description = "Handle passing of status messages between screens of a web application";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ stdenv.lib.maintainers.rycee ];
+    };
+  };
+
   CatalystViewDownload = buildPerlPackage rec {
     name = "Catalyst-View-Download-0.09";
     src = fetchurl {

From dd78cf793335d3891cb28ce4e91893411b72190d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 31 Oct 2015 01:24:43 +0100
Subject: [PATCH 013/130] perl-UnicodeCaseFold: init at 1.00

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f35babc840c..b6757f2fff6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12119,6 +12119,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  UnicodeCaseFold = buildPerlModule rec {
+    name = "Unicode-CaseFold-1.00";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz";
+      sha256 = "c489b5a440e84b0554e866d3fe4077fa1956eeed473e203588e0c24acce1f016";
+    };
+    meta = {
+      homepage = http://metacpan.org/release/Unicode-CaseFold;
+      description = "Unicode case-folding for case-insensitive lookups";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ stdenv.lib.maintainers.rycee ];
+    };
+  };
+
   UnicodeCheckUTF8 = buildPerlPackage {
     name = "Unicode-CheckUTF8-1.03";
     src = fetchurl {

From 3406cdd0ce2cc68f5c840380f869b99854dd0f67 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 30 Oct 2015 19:40:35 -0700
Subject: [PATCH 014/130] rustc: 1.3.0 -> 1.4.0

---
 pkgs/development/compilers/rustc/default.nix  | 19 ++++---
 .../compilers/rustc/patches/cc-ar-opts.patch  | 57 -------------------
 2 files changed, 10 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/development/compilers/rustc/patches/cc-ar-opts.patch

diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index 00bfb3222e0..19e746d7dbf 100644
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -1,10 +1,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "1.3.0";
+  shortVersion = "1.4.0";
   isRelease = true;
+  forceBundledLLVM = false;
   configureFlags = [ "--release-channel=stable" ];
-  srcSha = "14lhk40n9aslz8h8wj7fas5vsgyrb38b2r319q3hlvplgggdksg8";
+  srcSha = "13wpi9nb3h6wwck2mxhza85fahzcwgas00w8m25086v34dha4dp1";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.
@@ -14,14 +15,14 @@ callPackage ./generic.nix {
   for the tagged release and not a snapshot in the current HEAD.
   */
 
-  snapshotHashLinux686 = "3459275cdf3896f678e225843fa56f0d9fdbabe8";
-  snapshotHashLinux64 = "e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c";
-  snapshotHashDarwin686 = "428944a7984c0988e77909d82ca2ef77d96a1fbd";
-  snapshotHashDarwin64 = "b0515bb7d2892b9a58282fc865fee11a885406d6";
-  snapshotDate = "2015-07-26";
-  snapshotRev = "a5c12f4";
+  snapshotHashLinux686 = "e2553bf399cd134a08ef3511a0a6ab0d7a667216";
+  snapshotHashLinux64 = "7df8ba9dec63ec77b857066109d4b6250f3d222f";
+  snapshotHashDarwin686 = "29750870c82a0347f8b8b735a4e2e0da26f5098d";
+  snapshotHashDarwin64 = "c9f2c588238b4c6998190c3abeb33fd6164099a2";
+  snapshotDate = "2015-08-11";
+  snapshotRev = "1af31d4";
 
   # cc-ar-opts.patch should be removable in 1.4.0+
-  patches = [ ./patches/remove-uneeded-git.patch ./patches/cc-ar-opts.patch ]
+  patches = [ ./patches/remove-uneeded-git.patch ]
     ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 }
diff --git a/pkgs/development/compilers/rustc/patches/cc-ar-opts.patch b/pkgs/development/compilers/rustc/patches/cc-ar-opts.patch
deleted file mode 100644
index e73d54de8f5..00000000000
--- a/pkgs/development/compilers/rustc/patches/cc-ar-opts.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From c97759699264c6b1fa0e88420cd3c720df25e594 Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Tue, 11 Aug 2015 01:09:21 +0200
-Subject: [PATCH] rustc_back: add configure options for default linker and ar
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
----
- configure                       | 4 ++++
- mk/target.mk                    | 4 ++++
- src/librustc_back/target/mod.rs | 4 ++--
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 071788c..dc9d7d7 100755
---- a/configure
-+++ b/configure
-@@ -607,6 +607,10 @@ valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
- valopt release-channel "dev" "the name of the release channel to build"
- valopt musl-root "/usr/local" "MUSL root installation directory"
- 
-+# Used on systems where "cc" and "ar" are unavailable
-+valopt default-linker "cc" "the default linker"
-+valopt default-ar     "ar" "the default ar"
-+
- # Many of these are saved below during the "writing configuration" step
- # (others are conditionally saved).
- opt_nosave manage-submodules 1 "let the build manage the git submodules"
-diff --git a/mk/target.mk b/mk/target.mk
-index aae66c4..408ab96 100644
---- a/mk/target.mk
-+++ b/mk/target.mk
-@@ -13,6 +13,10 @@
- # this exists can be found on issue #2400
- export CFG_COMPILER_HOST_TRIPLE
- 
-+# Used as defaults for the runtime ar and cc tools
-+export CFG_DEFAULT_LINKER
-+export CFG_DEFAULT_AR
-+
- # The standard libraries should be held up to a higher standard than any old
- # code, make sure that these common warnings are denied by default. These can
- # be overridden during development temporarily. For stage0, we allow warnings
-diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
-index d9cfdaa..542791a 100644
---- a/src/librustc_back/target/mod.rs
-+++ b/src/librustc_back/target/mod.rs
-@@ -185,8 +185,8 @@ impl Default for TargetOptions {
-     fn default() -> TargetOptions {
-         TargetOptions {
-             data_layout: String::new(),
--            linker: "cc".to_string(),
--            ar: "ar".to_string(),
-+            linker: option_env!("CFG_DEFAULT_LINKER").unwrap_or("cc").to_string(),
-+            ar: option_env!("CFG_DEFAULT_AR").unwrap_or("ar").to_string(),
-             pre_link_args: Vec::new(),
-             post_link_args: Vec::new(),
-             cpu: "generic".to_string(),

From aed092339d7744b5ae329617625450cd5eb279a1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 30 Oct 2015 19:40:52 -0700
Subject: [PATCH 015/130] rustcMaster: 2015-10-17 -> 2015-10-27

---
 pkgs/development/compilers/rustc/head.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 94fdb0b3424..7b59c514610 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,11 +2,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "2015-10-17";
+  shortVersion = "2015-10-27";
   isRelease = false;
-  forceBundledLLVM = true;
-  srcRev = "20a6938c0";
-  srcSha = "18dalmwmyw2csnm72qwkkh37ixxbrn2i5lmwp2q0x9plh5qj5627";
+  forceBundledLLVM = false;
+  srcRev = "8ab8581f6921bc7a8e3fa4defffd2814372dcb15";
+  srcSha = "06sg327y95zx7w4jxl6i34j4x2g8mhhvri8gxk4qcfmar4cg8has";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.

From 9da6517c3650140f913b2ea5176650969152e8f4 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 30 Oct 2015 20:15:19 -0700
Subject: [PATCH 016/130] atlas: patch out usage of deprecated tmpnam on darwin

---
 .../libraries/science/math/atlas/default.nix  |   3 +-
 .../libraries/science/math/atlas/tmpdir.patch | 276 ++++++++++++++++++
 2 files changed, 278 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/science/math/atlas/tmpdir.patch

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index f4bda4f4735..6eb72f2ed64 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -63,7 +63,8 @@ stdenv.mkDerivation {
   # performance timings. We ignore that check, however, because with binaries
   # being pre-built on Hydra those timings aren't accurate for the local
   # machine in the first place.
-  patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch;
+  patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch
+    ++ optional stdenv.isDarwin ./tmpdir.patch;
 
   # Configure outside of the source directory.
   preConfigure = ''
diff --git a/pkgs/development/libraries/science/math/atlas/tmpdir.patch b/pkgs/development/libraries/science/math/atlas/tmpdir.patch
new file mode 100644
index 00000000000..be571b94300
--- /dev/null
+++ b/pkgs/development/libraries/science/math/atlas/tmpdir.patch
@@ -0,0 +1,276 @@
+diff --git a/CONFIG/ARCHS/negflt.c b/CONFIG/ARCHS/negflt.c
+index e5b7871..d45e387 100644
+--- a/CONFIG/ARCHS/negflt.c
++++ b/CONFIG/ARCHS/negflt.c
+@@ -239,7 +239,7 @@ void NegFile(char *fnam, int N, int *cols)
+    FILE *fpin, *fpout;
+    WORDS *wp0, *wp;
+ 
+-   tnam = tmpnam(NULL);
++   tnam = tempnam(NULL, NULL);
+    fpin = fopen(fnam, "r");
+    assert(fpin);
+    fpout = fopen(tnam, "w");
+diff --git a/CONFIG/include/atlas_sys.h b/CONFIG/include/atlas_sys.h
+index b83a749..8902d38 100644
+--- a/CONFIG/include/atlas_sys.h
++++ b/CONFIG/include/atlas_sys.h
+@@ -216,12 +216,13 @@ static char *ATL_fgets_CWS(char *sout, int *plen, FILE *fpin)
+ 
+ static char *ATL_tmpnam(void)
+ {
+-   static char tnam[L_tmpnam];
++   static char *tnam;
+    static char FirstTime=1;
+    if (FirstTime)
+    {
+       FirstTime = 0;
+-      assert(tmpnam(tnam));
++      tnam = tempnam(NULL, NULL);
++      assert(tnam);
+    }
+    return(tnam);
+ }
+diff --git a/bin/atlas_install.c b/bin/atlas_install.c
+index 2753cbf..e49cc3e 100644
+--- a/bin/atlas_install.c
++++ b/bin/atlas_install.c
+@@ -662,7 +662,8 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ {
+    const char TR[2] = {'N','T'};
+    char prec[4] = {'d', 's', 'z', 'c'}, pre, upre, *typ;
+-   char ln[1024], tnam[256], ln2[512], ln3[512], fnam[128];
++   char ln[1024], ln2[512], ln3[512], fnam[128];
++   char *tnam;
+    char *mulinst, *peakstr, *peakstr2;
+    int nprec=4;
+    int iL1, lat, muladd, maused, latuse, lbnreg;
+@@ -681,7 +682,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+    fpsum = fopen("INSTALL_LOG/SUMMARY.LOG", "a");
+    ATL_Cassert(fpsum, "OPENING INSTALL_LOG/SUMMARY.LOG", NULL);
+ 
+-   ATL_Cassert(tmpnam(tnam), "GETTING TEMPFILE", NULL);
++   ATL_Cassert((tnam = tempnam(NULL, NULL)), "GETTING TEMPFILE", NULL);
+ 
+    if (L1DEF)
+    {
+diff --git a/bin/extract.c b/bin/extract.c
+index 7a5a926..53fb8bf 100644
+--- a/bin/extract.c
++++ b/bin/extract.c
+@@ -3378,7 +3378,7 @@ void PushProc0(EXTENV *EE, EXTPROC **basep, EXTPROC **myfuncs, char *ln)
+    pp->argnams = KillWord(wp, wp);
+    pp->nargs = CountWords(pp->argnams);
+ 
+-   cp = tmpnam(NULL);
++   cp = tempnam(NULL, NULL);
+    if (cp == NULL) ExtErr(EE, "Out of tmpnams!!!");
+    i = Wstrlen(cp) + 1;
+    pp->FileNam = malloc(i*sizeof(char));
+diff --git a/include/atlas_mvtesttime.h b/include/atlas_mvtesttime.h
+index 9147fcb..ab6a99f 100644
+--- a/include/atlas_mvtesttime.h
++++ b/include/atlas_mvtesttime.h
+@@ -105,14 +105,15 @@ static int MVKernelFailsTest
+    char ln[4096];
+    char *sp;
+    int i, lda0;
+-   static char outnam[L_tmpnam];
++   static char* outnam;
+    static int FirstTime=1;
+ 
+    if (FirstTime)
+    {
+ 
+       FirstTime = 0;
+-      assert(tmpnam(outnam));
++      outnam = tempnam(NULL, NULL);
++      assert(outnam);
+    }
+ /*
+  * If the file is generated, call generator to create it
+@@ -221,14 +222,15 @@ static double TimeMVKernel
+    char ln[2048], resf[256], *sp;
+    double *dp, mf;
+    int i, align = pre2size(pre);
+-   static char outnam[L_tmpnam];
++   static char* outnam;
+    static int FirstTime=1;
+ 
+    if (FirstTime)
+    {
+ 
+       FirstTime = 0;
+-      assert(tmpnam(outnam));
++      outnam = tempnam(NULL, NULL);
++      assert(outnam);
+    }
+ /*
+  * If the file is generated, call generator to create it
+diff --git a/include/atlas_r1testtime.h b/include/atlas_r1testtime.h
+index b33213a..f27ee25 100644
+--- a/include/atlas_r1testtime.h
++++ b/include/atlas_r1testtime.h
+@@ -76,14 +76,15 @@ static int R1KernelFailsTest
+    char ln[4096];
+    char *sp;
+    int i, lda0;
+-   static char outnam[L_tmpnam];
++   static char* outnam;
+    static int FirstTime=1;
+ 
+    if (FirstTime)
+    {
+ 
+       FirstTime = 0;
+-      assert(tmpnam(outnam));
++      outnam = tempnam(NULL, NULL);
++      assert(outnam);
+    }
+ /*
+  * If the file is generated, call generator to create it
+@@ -187,14 +188,15 @@ static double TimeR1Kernel
+    char ln[2048], resf[256], *sp;
+    double *dp, mf;
+    int i, align = pre2size(pre);
+-   static char outnam[L_tmpnam];
++   static char* outnam;
+    static int FirstTime=1;
+ 
+    if (FirstTime)
+    {
+ 
+       FirstTime = 0;
+-      assert(tmpnam(outnam));
++      outnam = tempnam(NULL, NULL);
++      assert(outnam);
+    }
+ /*
+  * If the file is generated, call generator to create it
+diff --git a/include/atlas_r2testtime.h b/include/atlas_r2testtime.h
+index facc66d..c638dce 100644
+--- a/include/atlas_r2testtime.h
++++ b/include/atlas_r2testtime.h
+@@ -76,14 +76,15 @@ static int R2KernelFailsTest
+    char ln[4096];
+    char *sp;
+    int i, lda0;
+-   static char outnam[L_tmpnam];
++   static char* outnam;
+    static int FirstTime=1;
+ 
+    if (FirstTime)
+    {
+ 
+       FirstTime = 0;
+-      assert(tmpnam(outnam));
++      outnam = tempnam(NULL, NULL);
++      assert(outnam);
+    }
+ /*
+  * If the file is generated, call generator to create it
+@@ -187,14 +188,15 @@ static double TimeR2Kernel
+    char ln[2048], resf[256], *sp;
+    double *dp, mf;
+    int i, align = pre2size(pre);
+-   static char outnam[L_tmpnam];
++   static char* outnam;
+    static int FirstTime=1;
+ 
+    if (FirstTime)
+    {
+ 
+       FirstTime = 0;
+-      assert(tmpnam(outnam));
++      outnam = tempnam(NULL, NULL);
++      assert(outnam);
+    }
+ /*
+  * If the file is generated, call generator to create it
+diff --git a/include/atlas_sys.h b/include/atlas_sys.h
+index b83a749..b3f88d2 100644
+--- a/include/atlas_sys.h
++++ b/include/atlas_sys.h
+@@ -216,12 +216,13 @@ static char *ATL_fgets_CWS(char *sout, int *plen, FILE *fpin)
+ 
+ static char *ATL_tmpnam(void)
+ {
+-   static char tnam[L_tmpnam];
++   static char* tnam;
+    static char FirstTime=1;
+    if (FirstTime)
+    {
+       FirstTime = 0;
+-      assert(tmpnam(tnam));
++      tnam = tempnam(NULL, NULL);
++      assert(tnam);
+    }
+    return(tnam);
+ }
+diff --git a/tune/blas/gemm/usercomb.c b/tune/blas/gemm/usercomb.c
+index 59a7cd4..eb3eb05 100644
+--- a/tune/blas/gemm/usercomb.c
++++ b/tune/blas/gemm/usercomb.c
+@@ -138,11 +138,13 @@ int GetUserCase(char pre, int icase, int *iflag, int *mb, int *nb, int *kb,
+ 
+ void CombineFiles(char *fout, int nfiles, char **fnams)
+ {
+-   char tnam[256], ln[512];
++   char ln[512];
++   char *tnam;
+    int i, j, n, nn;
+    FILE *fpout, *fpin;
+ 
+-   assert(tmpnam(tnam));
++   tnam = tempnam(NULL, NULL);
++   assert(tnam);
+    for (n=i=0; i < nfiles; i++) n += NumUserCases0(fnams[i]);
+ 
+    fpout = fopen(tnam, "w");
+diff --git a/tune/blas/gemm/userflag.c b/tune/blas/gemm/userflag.c
+index c3983e4..b7dd70b 100644
+--- a/tune/blas/gemm/userflag.c
++++ b/tune/blas/gemm/userflag.c
+@@ -139,8 +139,8 @@ int GetUserCase(char pre, int icase, int *iflag, int *mb, int *nb, int *kb,
+ 
+ void GoGetThem(char *infile, char *outfile)
+ {
+-   char ln[512], ln2[512], tnam[256], MCC[256], MMFLAGS[256];
+-   char *chkfile = "FlagCheck.c", *sp, *sp2;
++   char ln[512], ln2[512], MCC[256], MMFLAGS[256];
++   char *chkfile = "FlagCheck.c", *sp, *sp2, *tnam;
+    FILE *fpin, *fpout;
+    int i, j, n, nmin=0, good;
+    int wass;
+@@ -152,7 +152,8 @@ void GoGetThem(char *infile, char *outfile)
+    n = NumUserCases0(infile);
+    fpin = fopen(infile, "r");
+    assert(fpin);
+-   assert(tmpnam(tnam));
++   tnam = tempnam(NULL, NULL);
++   assert(tnam);
+    fpout = fopen(tnam, "w");
+    assert(fpout);
+    assert(fgets(ln, 512, fpin));
+diff --git a/tune/sysinfo/emit_buildinfo.c b/tune/sysinfo/emit_buildinfo.c
+index 309c06a..3feaea7 100644
+--- a/tune/sysinfo/emit_buildinfo.c
++++ b/tune/sysinfo/emit_buildinfo.c
+@@ -41,14 +41,15 @@ static char SMCVERS[LNLEN], DMCVERS[LNLEN], SKCVERS[LNLEN], DKCVERS[LNLEN];
+ static char UNAM[64], DATE[128];
+ char *CmndResults(char *cmnd)
+ {
+-   static char tnam[128];
++   static char* tnam;
+    static int FirstTime=1;
+    char ln[512];
+ 
+    if (FirstTime)
+    {
+       FirstTime = 0;
+-      assert(tmpnam(tnam));
++      tnam = tempnam(NULL, NULL);
++      assert(tnam);
+    }
+    sprintf(ln, "%s > %s\n", cmnd, tnam);
+    fprintf(stderr, "system: %s", ln);

From 35dd880019d159dab2517a324ff6d08ad09d244a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 31 Oct 2015 04:25:37 +0100
Subject: [PATCH 017/130] haskellPackages: skip hsparql checks

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 38efe7ae1ad..95fcb6aa80e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -402,6 +402,7 @@ self: super: {
   hs2048 = dontCheck super.hs2048;
   hsbencher = dontCheck super.hsbencher;
   hsexif = dontCheck super.hsexif;
+  hsparql = dontCheck super.hsparql; # https://github.com/robstewart57/hsparql/issues/15
   hspec-server = dontCheck super.hspec-server;
   HTF = dontCheck super.HTF;
   HTF_0_12_2_3 = dontCheck super.HTF_0_12_2_3;
@@ -442,6 +443,7 @@ self: super: {
   punycode = dontCheck super.punycode;
   pwstore-cli = dontCheck super.pwstore-cli;
   quantities = dontCheck super.quantities;
+  rdf4h = dontCheck super.rdf4h; # https://github.com/robstewart57/rdf4h/issues/32
   redis-io = dontCheck super.redis-io;
   rethinkdb = dontCheck super.rethinkdb;
   Rlang-QQ = dontCheck super.Rlang-QQ;

From ffd26935ccb46602e18d024a99751d4548ccea77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 28 Oct 2015 18:41:40 +0100
Subject: [PATCH 018/130] lilypond: allow build on darwin

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

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 9021092d928..21df615d661 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec{
     homepage = http://lilypond.org/;
     license = licenses.gpl3;
     maintainers = [ maintainers.marcweber ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 
   patches = [ ./findlib.patch ];

From bcc7f58c1f9ed30399c3ca6d9f23a7cc1acd1cdf Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 31 Oct 2015 02:23:54 +0100
Subject: [PATCH 019/130] mbuffer: new package

---
 lib/maintainers.nix                 |  1 +
 pkgs/tools/misc/mbuffer/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/misc/mbuffer/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 443fe780bc0..20dd2581eb8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -279,6 +279,7 @@
   theuni = "Christian Theune <ct@flyingcircus.io>";
   thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
   titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
+  tokudan = "Daniel Frank <git@danielfrank.net>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
   travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
   trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
new file mode 100644
index 00000000000..35681836931
--- /dev/null
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl,
+	openssl,
+ } :
+
+stdenv.mkDerivation rec {
+  name = "mbuffer-20151012";
+
+  src = fetchurl {
+    url = "http://www.maier-komor.de/software/mbuffer/mbuffer-20151002.tgz";
+    sha256 = "04pz70jr7fkdyax7b67g9jr0msl6ff2i8s6fl8zginqz5rrxckqk";
+  };
+
+  buildInputs = [ openssl ];
+
+  meta = {
+    homepage = http://www.maier-komor.de/mbuffer.html;
+    description  = "mbuffer is a tool for buffering data streams with a large set of unique features";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ tokudan ];
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c4ae620eca..2b3b346da17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2193,6 +2193,8 @@ let
 
   mbox = callPackage ../tools/security/mbox { };
 
+  mbuffer = callPackage ../tools/misc/mbuffer { };
+
   memtest86 = callPackage ../tools/misc/memtest86 { };
 
   memtest86plus = callPackage ../tools/misc/memtest86+ { };

From d767aae72179d0e323584d5c4811be1f408d45ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 31 Oct 2015 16:03:01 +0100
Subject: [PATCH 020/130] sddm module: support autologin configuration

---
 .../services/x11/display-managers/sddm.nix    | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 4594155ea13..5ca3a44324f 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -36,9 +36,22 @@ let
     SessionDir=${dmcfg.session.desktops}
     XauthPath=${pkgs.xorg.xauth}/bin/xauth
 
+    ${optionalString cfg.autoLogin.enable ''
+    [Autologin]
+    User=${cfg.autoLogin.user}
+    Session=${defaultSessionName}.desktop
+    Relogin=${if cfg.autoLogin.relogin then "true" else "false"}
+    ''}
+
     ${cfg.extraConfig}
   '';
 
+  defaultSessionName =
+    let
+      dm = xcfg.desktopManager.default;
+      wm = xcfg.windowManager.default;
+    in dm + optionalString (wm != "none") (" + " + wm);
+
 in
 {
   options = {
@@ -72,12 +85,62 @@ in
           Greeter theme to use.
         '';
       };
+
+      autoLogin = mkOption {
+        default = {};
+        description = ''
+          Configuration for automatic login.
+        '';
+
+        type = types.submodule {
+	  options = {
+            enable = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Automatically log in as the sepecified <option>autoLogin.user</option>.
+              '';
+            };
+
+            user = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                User to be used for the autologin.
+              '';
+            };
+
+            relogin = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                If true automatic login will kick in again on session exit, otherwise it
+                will work only the first time.
+              '';
+            };
+	  };
+        };
+      };
+
     };
 
   };
 
   config = mkIf cfg.enable {
 
+    assertions = [
+      { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null;
+        message = "SDDM auto-login requires services.xserver.displayManager.sddm.autoLogin.user to be set";
+      }
+      { assertion = cfg.autoLogin.enable -> elem defaultSessionName dmcfg.session.names;
+        message = ''
+          SDDM auto-login requires that services.xserver.desktopManager.default and
+	  services.xserver.windowMananger.default are set to valid values. The current
+	  default session: ${defaultSessionName} is not valid.
+	'';
+      }
+    ];
+
     services.xserver.displayManager.slim.enable = false;
 
     services.xserver.displayManager.job = {
@@ -108,6 +171,18 @@ in
         session  optional       pam_keyinit.so force revoke
         session  optional       pam_permit.so
       '';
+
+      sddm-autologin.text = ''
+        auth     requisite pam_nologin.so
+        auth     required  pam_succeed_if.so uid >= 1000 quiet
+        auth     required  pam_permit.so
+
+        account  include   sddm
+
+        password include   sddm
+
+        session  include   sddm
+      '';
     };
 
     users.extraUsers.sddm = {

From 42dfe8f4e109241126aeb370d6d5cf1b519c0397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 28 Oct 2015 18:53:31 +0100
Subject: [PATCH 021/130] ascii: allow build on darwin

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

diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix
index 45579164513..1dde1638b81 100644
--- a/pkgs/tools/text/ascii/default.nix
+++ b/pkgs/tools/text/ascii/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Interactive ASCII name and synonym chart";
     homepage = "http://www.catb.org/~esr/ascii/";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.bjornfor ];
   };
 }

From 8c183349e557911066abd10c36add257c6e34531 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 Oct 2015 09:32:30 -0700
Subject: [PATCH 022/130] emacs24Macport: update 24.5-mac-5.12 -> 24.5-mac-5.13

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

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index 5ba09971675..6b377abdda1 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   emacsName = "emacs-24.5";
-  name = "${emacsName}-mac-5.12";
+  name = "${emacsName}-mac-5.13";
 
   #builder = ./builder.sh;
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "1kryg4xw2jn2jwd9ilm2snjvgmnbbp392ry1skzl4d4xf7ff3vx1";
+    sha256 = "0p8xpsnsdpwpfq4mz0fazm785d0my0pq4ifbw533g959jh17b36h";
   };
 
   enableParallelBuilding = true;

From 8f97ad7b3c7643b3845e61d7792013aa9b8ada3d Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 Oct 2015 09:33:05 -0700
Subject: [PATCH 023/130] coqPackages.ssreflect: add ncurses as a dependency

This is needed in the Darwin pure environment, where ncurses is not
available within the sandbox.  The exact error was:

coqmktop -coqlib `coqtop -where` -o bin/ssrcoq.byte -I +threads src/ssrmatching.cmo src/ssreflect.cmo
ld: warning: directory not found for option '-L/nix/store/wlf8pb7gz5alzbhdxwayxx0x4as3rnw8-coq-8.5b2/lib/coq/kernel/byterun'
ld: library not found for -lncurses
---
 pkgs/development/coq-modules/ssreflect/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
index e208f1cc25a..3bfccab0be7 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coq
+{ stdenv, fetchurl, coq, ncurses
 , graphviz, withDoc ? true
 , src, patches ? []
 }:
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   inherit src;
 
   nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
-  buildInputs = [ coq.ocaml coq.camlp5 ];
+  buildInputs = [ coq.ocaml coq.camlp5 ncurses ];
   propagatedBuildInputs = [ coq ];
 
   enableParallelBuilding = true;

From cdfb08b9c6d3035c7379c63268109cd5f0431bad Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 Oct 2015 09:34:26 -0700
Subject: [PATCH 024/130] haskellPackages.c2hs: Disable tests on Darwin

The tests require gcc, but gcc is no longer available on Darwin systems.
---
 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 61e7ecdc686..ca6373ded94 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -48,6 +48,7 @@ self: super: {
   text_1_2_0_4 = dontCheck super.text_1_2_0_4;
   text_1_2_0_6 = dontCheck super.text_1_2_0_6;
   text = dontCheck super.text;
+  c2hs = if pkgs.stdenv.isDarwin then dontCheck super.c2hs else super.c2hs;
 
   # The package doesn't compile with ruby 1.9, which is our default at the moment.
   hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };

From 22392d8134bdab37c1c20cc61e7af78cceeced04 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 Oct 2015 09:35:06 -0700
Subject: [PATCH 025/130] Correction to Boost RPATH for Darwin systems

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

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index cd98c0a312b..2a83d7c4142 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation {
     NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
     if test -f tools/build/src/tools/clang-darwin.jam ; then
         substituteInPlace tools/build/src/tools/clang-darwin.jam \
-          --replace '$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)";
+          --replace '@rpath/$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)";
     fi;
   '' + optionalString (mpi != null) ''
     cat << EOF > user-config.jam

From a39832a12c0420a8c96a8e093e6e88c12a04f0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 28 Oct 2015 18:49:04 +0100
Subject: [PATCH 026/130] xdg-utils: allow build on darwin

---
 pkgs/tools/X11/xdg-utils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index a8915e38d37..23b406c2d43 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     description = "A set of command line tools that assist applications with a variety of desktop integration tasks";
     license = if mimiSupport then licenses.gpl2 else licenses.free;
     maintainers = [ maintainers.eelco ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 7a6fe2d4c54a8014ae5a294bb4f2f616460efa69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 31 Oct 2015 11:32:17 +0100
Subject: [PATCH 027/130] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20150922-27-g14f44af using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/07b9003464c39236dc8d55acfca0bc44de25f954
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/b8c50379aeb1c9a82998ed8e978df8cc68652852
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/4622b913dcfa6d442d875c8604a87cc79884f74c
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/05c38f5cda81680f98e751a37a66f5c1f2730789
---
 .../haskell-modules/configuration-lts-0.0.nix |   2 +
 .../haskell-modules/configuration-lts-0.1.nix |   2 +
 .../haskell-modules/configuration-lts-0.2.nix |   2 +
 .../haskell-modules/configuration-lts-0.3.nix |   2 +
 .../haskell-modules/configuration-lts-0.4.nix |   2 +
 .../haskell-modules/configuration-lts-0.5.nix |   2 +
 .../haskell-modules/configuration-lts-0.6.nix |   2 +
 .../haskell-modules/configuration-lts-0.7.nix |   2 +
 .../haskell-modules/configuration-lts-1.0.nix |   2 +
 .../haskell-modules/configuration-lts-1.1.nix |   2 +
 .../configuration-lts-1.10.nix                |   2 +
 .../configuration-lts-1.11.nix                |   2 +
 .../configuration-lts-1.12.nix                |   2 +
 .../configuration-lts-1.13.nix                |   2 +
 .../configuration-lts-1.14.nix                |   2 +
 .../configuration-lts-1.15.nix                |   2 +
 .../haskell-modules/configuration-lts-1.2.nix |   2 +
 .../haskell-modules/configuration-lts-1.4.nix |   2 +
 .../haskell-modules/configuration-lts-1.5.nix |   2 +
 .../haskell-modules/configuration-lts-1.7.nix |   2 +
 .../haskell-modules/configuration-lts-1.8.nix |   2 +
 .../haskell-modules/configuration-lts-1.9.nix |   2 +
 .../haskell-modules/configuration-lts-2.0.nix |   2 +
 .../haskell-modules/configuration-lts-2.1.nix |   2 +
 .../configuration-lts-2.10.nix                |   3 +
 .../configuration-lts-2.11.nix                |   3 +
 .../configuration-lts-2.12.nix                |   3 +
 .../configuration-lts-2.13.nix                |   3 +
 .../configuration-lts-2.14.nix                |   3 +
 .../configuration-lts-2.15.nix                |   3 +
 .../configuration-lts-2.16.nix                |   3 +
 .../configuration-lts-2.17.nix                |   3 +
 .../configuration-lts-2.18.nix                |   3 +
 .../configuration-lts-2.19.nix                |   3 +
 .../haskell-modules/configuration-lts-2.2.nix |   2 +
 .../configuration-lts-2.20.nix                |   3 +
 .../configuration-lts-2.21.nix                |   3 +
 .../configuration-lts-2.22.nix                |   3 +
 .../haskell-modules/configuration-lts-2.3.nix |   2 +
 .../haskell-modules/configuration-lts-2.4.nix |   2 +
 .../haskell-modules/configuration-lts-2.5.nix |   3 +
 .../haskell-modules/configuration-lts-2.6.nix |   3 +
 .../haskell-modules/configuration-lts-2.7.nix |   3 +
 .../haskell-modules/configuration-lts-2.8.nix |   3 +
 .../haskell-modules/configuration-lts-2.9.nix |   3 +
 .../haskell-modules/configuration-lts-3.0.nix |   6 +
 .../haskell-modules/configuration-lts-3.1.nix |   6 +
 .../configuration-lts-3.10.nix                |   9 +
 .../configuration-lts-3.11.nix                |   9 +
 .../haskell-modules/configuration-lts-3.2.nix |   6 +
 .../haskell-modules/configuration-lts-3.3.nix |   6 +
 .../haskell-modules/configuration-lts-3.4.nix |   6 +
 .../haskell-modules/configuration-lts-3.5.nix |   6 +
 .../haskell-modules/configuration-lts-3.6.nix |   6 +
 .../haskell-modules/configuration-lts-3.7.nix |   9 +
 .../haskell-modules/configuration-lts-3.8.nix |   9 +
 .../haskell-modules/configuration-lts-3.9.nix |   9 +
 .../haskell-modules/hackage-packages.nix      | 335 +++++++++++-------
 58 files changed, 410 insertions(+), 120 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index bd4da904237..2eb6e83b9f2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -4687,6 +4687,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5278,6 +5279,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index fc125bbd3eb..6f48792bd07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -4686,6 +4686,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5277,6 +5278,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index ae160678cc8..ae9963e7b7b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -4686,6 +4686,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5277,6 +5278,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index f14e02ca957..6b0a8885ba7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -4686,6 +4686,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5277,6 +5278,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 82849d88bee..2cddc6233f4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -4683,6 +4683,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5274,6 +5275,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 565e76d132a..eb721a392f8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -4683,6 +4683,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5274,6 +5275,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index edb06cde709..b8c40ed984c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -4679,6 +4679,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5270,6 +5271,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 4a18599e789..e891769b705 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -4679,6 +4679,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5270,6 +5271,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 6b23e833a95..79a809ca0e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -4667,6 +4667,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5258,6 +5259,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index aa584a8b7bb..a7172b7006c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -4656,6 +4656,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5246,6 +5247,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 729e39ebfd3..7699a1407b7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -4635,6 +4635,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5223,6 +5224,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index d0f2ad1cc0d..ecebce15317 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -4633,6 +4633,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5219,6 +5220,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 3de8227f7fc..ec1edf6a3c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -4632,6 +4632,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5218,6 +5219,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index c53362b5b2a..df8bfe07113 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -4630,6 +4630,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5216,6 +5217,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index c739f825fb5..edce63dcc53 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -4626,6 +4626,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5211,6 +5212,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 76b3767ffdf..d97413156b4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -4621,6 +4621,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5206,6 +5207,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 73d8cf4c8fd..bb7c5af4eef 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -4653,6 +4653,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5243,6 +5244,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 207541f7ab8..5199b16dd74 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -4650,6 +4650,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5240,6 +5241,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 15ae194a8eb..68be00d2c5f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -4648,6 +4648,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5238,6 +5239,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index d2958805f39..fbd211e66f4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -4643,6 +4643,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5232,6 +5233,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 83a02ceb159..afbd978fc49 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -4639,6 +4639,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5227,6 +5228,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index dd1ac4a8a74..77cbc3f352f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -4637,6 +4637,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5225,6 +5226,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 00fda01d3a1..8fdbc66faa7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -4584,6 +4584,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5160,6 +5161,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 7da5c483609..cb9ed387e4e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -4582,6 +4582,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5158,6 +5159,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 2dabb3ce88f..b899570f5d1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -2549,6 +2549,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4552,6 +4553,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5121,6 +5123,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 06501352c5a..7b5a485bd96 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -2548,6 +2548,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4548,6 +4549,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5116,6 +5118,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 1a9f26da481..9e002ffece8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -2548,6 +2548,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4548,6 +4549,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5116,6 +5118,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 3c0c0934c98..c3f0bbda4ef 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -2548,6 +2548,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4546,6 +4547,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5114,6 +5116,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 96dc5525149..4f99f57f54d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -2547,6 +2547,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4543,6 +4544,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5111,6 +5113,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index b512d97e592..cb1b6382dd7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -2547,6 +2547,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4541,6 +4542,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5109,6 +5111,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index c745ae62bef..d11635a3c9b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -2542,6 +2542,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4532,6 +4533,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5099,6 +5101,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 5db571c5aa2..001c735c364 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -2539,6 +2539,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4524,6 +4525,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5091,6 +5093,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index f0e079ca50b..bf8b0b00632 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -2535,6 +2535,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4517,6 +4518,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5084,6 +5086,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 4f2aa9e0198..ece2b001c30 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -2535,6 +2535,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4516,6 +4517,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5083,6 +5085,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index e115ed55db2..36e03ba986b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -4578,6 +4578,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5154,6 +5155,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 427c3af7b37..1a8231e1385 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -2533,6 +2533,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4512,6 +4513,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5079,6 +5081,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 99b1366bdfd..c61479556c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -2533,6 +2533,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4511,6 +4512,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5077,6 +5079,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 6f759aa5168..c97272ca493 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -2532,6 +2532,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4509,6 +4510,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5074,6 +5076,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index ffc265ac99f..adf28b1dfb2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -4576,6 +4576,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5152,6 +5153,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index ac7b3dc3c2b..3983e19a68b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -4575,6 +4575,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5151,6 +5152,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 38fdae29f82..18d644afd39 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -2559,6 +2559,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4573,6 +4574,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5148,6 +5150,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 3ad61dca8ce..78ffac08757 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -2556,6 +2556,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4568,6 +4569,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5143,6 +5145,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 18d62afe7bb..6957a09c3a2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -2555,6 +2555,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4567,6 +4568,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5142,6 +5144,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 4278dd84271..d1a36cde252 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -2554,6 +2554,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4564,6 +4565,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5138,6 +5140,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 63b673ca3bb..dfeb212c4c6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -2551,6 +2551,7 @@ self: super: {
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
   "digits" = dontDistribute super."digits";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -4556,6 +4557,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -5129,6 +5131,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 5a4c3ac5dd1..d1a416f4729 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -2439,6 +2439,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3862,12 +3863,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4349,6 +4353,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4882,6 +4887,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 07b0b53e83b..ca3baf7785a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -2436,6 +2436,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3855,12 +3856,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4342,6 +4346,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4875,6 +4880,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 631e7476a62..71552b98178 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1857,6 +1857,9 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_4";
+  "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_4";
+  "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_4";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -2383,6 +2386,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3771,12 +3775,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4250,6 +4257,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4772,6 +4780,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 25ce8f6299b..479f6ab20a2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1854,6 +1854,9 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_4";
+  "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_4";
+  "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_4";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -2379,6 +2382,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3764,12 +3768,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4242,6 +4249,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4764,6 +4772,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 4fd801614d6..50ebb894732 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -2433,6 +2433,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3849,12 +3850,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4336,6 +4340,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4867,6 +4872,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 75fbfa34d5a..da560ba9e00 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -2428,6 +2428,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3842,12 +3843,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4328,6 +4332,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4859,6 +4864,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 04865afb3c0..eefcd11119a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -2427,6 +2427,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3841,12 +3842,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4327,6 +4331,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4858,6 +4863,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 0b3235a0cb6..9e7adf2471b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -2424,6 +2424,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3834,12 +3835,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4317,6 +4321,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4846,6 +4851,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 0a3a2a39c79..f52ac9b943d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -2420,6 +2420,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3822,12 +3823,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4304,6 +4308,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4828,6 +4833,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index faab7eb52f2..06602beaa29 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1872,6 +1872,9 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_4";
+  "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_4";
+  "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_4";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -2408,6 +2411,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3805,12 +3809,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4286,6 +4293,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4809,6 +4817,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index f6dd1ed5a8c..48fb42a3689 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1867,6 +1867,9 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_4";
+  "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_4";
+  "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_4";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -2394,6 +2397,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3790,12 +3794,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4271,6 +4278,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4794,6 +4802,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index ca6d81e6fbb..6b1a6df3d85 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1862,6 +1862,9 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_4";
+  "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_4";
+  "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_4";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -2388,6 +2391,7 @@ self: super: {
   "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
   "digit" = dontDistribute super."digit";
   "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
   "dimensional-tf" = dontDistribute super."dimensional-tf";
   "dingo-core" = dontDistribute super."dingo-core";
   "dingo-example" = dontDistribute super."dingo-example";
@@ -3781,12 +3785,15 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-interest" = dontDistribute super."hledger-interest";
   "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
   "hledger-ui" = dontDistribute super."hledger-ui";
   "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
@@ -4261,6 +4268,7 @@ self: super: {
   "imgurder" = dontDistribute super."imgurder";
   "imm" = dontDistribute super."imm";
   "imparse" = dontDistribute super."imparse";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
@@ -4784,6 +4792,7 @@ self: super: {
   "lojbanParser" = dontDistribute super."lojbanParser";
   "lojbanXiragan" = dontDistribute super."lojbanXiragan";
   "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
   "loli" = dontDistribute super."loli";
   "lookup-tables" = dontDistribute super."lookup-tables";
   "loop" = doDistribute super."loop_0_2_0";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 56caf73380d..96793a2c837 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -11012,6 +11012,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_2_6_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.2.6.2";
+       sha256 = "22952ab2e1152dcb2af1b0340ee4999516a6605b8ecbcbfd37e8dbd9d829aa43";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       homepage = "https://github.com/Twinside/Juicy.Pixels";
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-canvas" = callPackage
     ({ mkDerivation, base, containers, JuicyPixels }:
      mkDerivation {
@@ -18597,8 +18615,8 @@ self: {
      }:
      mkDerivation {
        pname = "WaveFront";
-       version = "0.1.0.0";
-       sha256 = "4516fbe7c034da2a05e4967222fdedf86dee4e10eef4589764889557004692be";
+       version = "0.1.0.2";
+       sha256 = "f18c307609ea324aab8c208e556cee679686bcae794380e05d8f43fdae1b03de";
        libraryHaskellDepends = [
          base containers filepath GLUtil lens linear OpenGL
        ];
@@ -30304,6 +30322,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aws_0_13_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , base64-bytestring, blaze-builder, byteable, bytestring
+     , case-insensitive, cereal, conduit, conduit-extra, containers
+     , cryptohash, data-default, directory, errors, filepath
+     , http-client, http-conduit, http-types, lifted-base, monad-control
+     , mtl, network, old-locale, QuickCheck, quickcheck-instances
+     , resourcet, safe, scientific, tagged, tasty, tasty-quickcheck
+     , text, time, transformers, transformers-base, unordered-containers
+     , utf8-string, vector, xml-conduit
+     }:
+     mkDerivation {
+       pname = "aws";
+       version = "0.13.0";
+       sha256 = "3504c96a00d12fa0fe4ae5ab4dafa3eec7ca576a02ed7906cff70a75625a75a6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring base64-bytestring
+         blaze-builder byteable bytestring case-insensitive cereal conduit
+         conduit-extra containers cryptohash data-default directory filepath
+         http-conduit http-types lifted-base monad-control mtl network
+         old-locale resourcet safe scientific tagged text time transformers
+         unordered-containers utf8-string vector xml-conduit
+       ];
+       testHaskellDepends = [
+         aeson base bytestring errors http-client lifted-base monad-control
+         mtl QuickCheck quickcheck-instances resourcet tagged tasty
+         tasty-quickcheck text time transformers transformers-base
+       ];
+       homepage = "http://github.com/aristidb/aws";
+       description = "Amazon Web Services (AWS) for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aws-cloudfront-signer" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring
      , bytestring, crypto-pubkey-types, RSA, time
@@ -30615,8 +30669,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-route53";
-       version = "0.1.2";
-       sha256 = "28c4ebcd9538249eedd87a20bd99f6573f3e5f3f5d0bd61bdd7dac59f877e061";
+       version = "0.1.2.1";
+       sha256 = "b67317d4949a2e6649392bb6fd1e72767c3658670dbd52867ca2169ca7e6b5bc";
        libraryHaskellDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
@@ -39409,7 +39463,6 @@ self: {
        homepage = "https://github.com/centromere/cacophony/wiki";
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "caf" = callPackage
@@ -43451,7 +43504,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "classy-prelude" = callPackage
+  "classy-prelude_0_12_4" = callPackage
     ({ mkDerivation, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, dlist, enclosed-exceptions, exceptions
      , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl
@@ -43476,9 +43529,10 @@ self: {
        homepage = "https://github.com/snoyberg/classy-prelude";
        description = "A typeclass-based Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "classy-prelude_0_12_5" = callPackage
+  "classy-prelude" = callPackage
     ({ mkDerivation, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, dlist, enclosed-exceptions, exceptions
      , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl
@@ -43503,7 +43557,6 @@ self: {
        homepage = "https://github.com/snoyberg/classy-prelude";
        description = "A typeclass-based Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classy-prelude-conduit_0_10_2" = callPackage
@@ -43671,7 +43724,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "classy-prelude-conduit" = callPackage
+  "classy-prelude-conduit_0_12_4" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
      , transformers, void
@@ -43687,12 +43740,14 @@ self: {
        testHaskellDepends = [
          base bytestring conduit hspec QuickCheck transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/snoyberg/classy-prelude";
        description = "conduit instances for classy-prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "classy-prelude-conduit_0_12_5" = callPackage
+  "classy-prelude-conduit" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
      , transformers, void
@@ -43708,11 +43763,9 @@ self: {
        testHaskellDepends = [
          base bytestring conduit hspec QuickCheck transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/snoyberg/classy-prelude";
        description = "conduit instances for classy-prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classy-prelude-yesod_0_10_2" = callPackage
@@ -43862,7 +43915,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "classy-prelude-yesod" = callPackage
+  "classy-prelude-yesod_0_12_4" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
      , persistent, yesod, yesod-newsfeed, yesod-static
@@ -43876,12 +43929,14 @@ self: {
          http-conduit http-types persistent yesod yesod-newsfeed
          yesod-static
        ];
+       jailbreak = true;
        homepage = "https://github.com/snoyberg/classy-prelude";
        description = "Provide a classy prelude including common Yesod functionality";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "classy-prelude-yesod_0_12_5" = callPackage
+  "classy-prelude-yesod" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
      , persistent, yesod, yesod-newsfeed, yesod-static
@@ -43895,11 +43950,9 @@ self: {
          http-conduit http-types persistent yesod yesod-newsfeed
          yesod-static
        ];
-       jailbreak = true;
        homepage = "https://github.com/snoyberg/classy-prelude";
        description = "Provide a classy prelude including common Yesod functionality";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clay" = callPackage
@@ -46604,19 +46657,19 @@ self: {
      }) {};
 
   "concurrent-output" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , exceptions, process, stm, text, transformers, unix
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, directory
+     , exceptions, process, stm, terminal-size, text, transformers, unix
      }:
      mkDerivation {
        pname = "concurrent-output";
-       version = "1.0.1";
-       sha256 = "694020da0978ba93d29b530b319d458db88792d961334d6f047591972cc62871";
+       version = "1.1.0";
+       sha256 = "3339267b1658769d6ad9c37e4c23e3931ebaf9d970334d85ffa4642f3081b2e1";
        libraryHaskellDepends = [
-         async base bytestring containers directory exceptions process stm
-         text transformers unix
+         ansi-terminal async base bytestring directory exceptions process
+         stm terminal-size text transformers unix
        ];
-       description = "handling concurrent output";
-       license = stdenv.lib.licenses.bsd3;
+       description = "Ungarble output from several threads";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "concurrent-sa" = callPackage
@@ -53901,8 +53954,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbmigrations";
-       version = "0.9";
-       sha256 = "2e9d9d971a2a8f771148a4b19ea8226e4fa2ac2eefb11c93afa4c9983838435c";
+       version = "0.9.1";
+       sha256 = "02fa493a7743c453eca74396e6f359c3e73f1265a9ef40d8d7a0e99fb259dde4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53921,34 +53974,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dbmigrations_0_9_1" = callPackage
-    ({ mkDerivation, base, bytestring, configurator, containers
-     , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3
-     , HUnit, mtl, process, random, template-haskell, text, time
-     , yaml-light
-     }:
-     mkDerivation {
-       pname = "dbmigrations";
-       version = "0.9.1";
-       sha256 = "02fa493a7743c453eca74396e6f359c3e73f1265a9ef40d8d7a0e99fb259dde4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring configurator containers directory fgl filepath HDBC
-         HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time
-         yaml-light
-       ];
-       executableHaskellDepends = [ base configurator ];
-       testHaskellDepends = [
-         base bytestring containers directory fgl filepath HDBC
-         HDBC-postgresql HDBC-sqlite3 HUnit mtl process template-haskell
-         time yaml-light
-       ];
-       description = "An implementation of relational database \"migrations\"";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "dbus_0_10_10" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
      , containers, directory, filepath, libxml-sax, network, parsec
@@ -57874,7 +57899,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dimensional" = callPackage
+  "dimensional_0_13_0_2" = callPackage
     ({ mkDerivation, base, numtype, time }:
      mkDerivation {
        pname = "dimensional";
@@ -57884,6 +57909,23 @@ self: {
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "dimensional" = callPackage
+    ({ mkDerivation, base, deepseq, exact-pi, HUnit, numtype-dk, vector
+     }:
+     mkDerivation {
+       pname = "dimensional";
+       version = "1.0.0.0";
+       sha256 = "1f66c105a4a11a3014b8387cd3df9a4d30124f7c49bacad72e425d7f95f13c38";
+       libraryHaskellDepends = [
+         base deepseq exact-pi numtype-dk vector
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/bjornbm/dimensional-dk/";
+       description = "Statically checked physical dimensions, using Type Families and Data Kinds";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "dimensional-tf" = callPackage
@@ -84903,6 +84945,7 @@ self: {
        homepage = "https://github.com/emilaxelsson/haskell-exp-parser";
        description = "Simple parser parser from Haskell to TemplateHaskell expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-formatter" = callPackage
@@ -92164,7 +92207,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hledger" = callPackage
+  "hledger_0_26" = callPackage
     ({ mkDerivation, base, base-compat, cmdargs, containers, csv
      , directory, filepath, haskeline, hledger-lib, HUnit, mtl
      , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
@@ -92196,12 +92239,14 @@ self: {
          pretty-show process regex-tdfa safe shakespeare split tabular
          test-framework test-framework-hunit text time transformers wizards
        ];
+       jailbreak = true;
        homepage = "http://hledger.org";
        description = "The main command-line interface for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hledger_0_27" = callPackage
+  "hledger" = callPackage
     ({ mkDerivation, base, base-compat, cmdargs, containers, csv
      , directory, filepath, haskeline, hledger-lib, HUnit, mtl
      , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
@@ -92234,11 +92279,9 @@ self: {
          terminfo test-framework test-framework-hunit text time
          unordered-containers utf8-string wizards
        ];
-       jailbreak = true;
        homepage = "http://hledger.org";
        description = "Command-line interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-chart" = callPackage
@@ -92271,6 +92314,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib time ];
+       jailbreak = true;
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
@@ -92300,8 +92344,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.7";
-       sha256 = "2433c196c7dc521efdab04fe4e9fca07dacd33d929742a29251b86ae7bd927be";
+       version = "0.1.1.8";
+       sha256 = "7dd9f5c870c508534c1c00d653ee4319cead5b912a446a8c3b4ef941caae3162";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92395,7 +92439,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hledger-lib" = callPackage
+  "hledger-lib_0_26" = callPackage
     ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
      , cmdargs, containers, csv, Decimal, directory, filepath, HUnit
      , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe
@@ -92420,9 +92464,10 @@ self: {
        homepage = "http://hledger.org";
        description = "Core data types, parsers and utilities for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hledger-lib_0_27" = callPackage
+  "hledger-lib" = callPackage
     ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
      , cmdargs, containers, csv, Decimal, deepseq, directory, filepath
      , HUnit, mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa
@@ -92448,7 +92493,6 @@ self: {
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-ui" = callPackage
@@ -92467,7 +92511,6 @@ self: {
          hledger hledger-lib HUnit lens pretty-show safe split time
          transformers vector vty
        ];
-       jailbreak = true;
        homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
        license = "GPL";
@@ -92532,7 +92575,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hledger-web" = callPackage
+  "hledger-web_0_26" = callPackage
     ({ mkDerivation, base, base-compat, blaze-html, blaze-markup
      , bytestring, clientsession, cmdargs, conduit-extra, data-default
      , directory, filepath, hjsmin, hledger, hledger-lib, hspec
@@ -92564,12 +92607,14 @@ self: {
          yesod-static
        ];
        testHaskellDepends = [ base base-compat hspec yesod yesod-test ];
+       jailbreak = true;
        homepage = "http://hledger.org";
        description = "A web interface for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hledger-web_0_27" = callPackage
+  "hledger-web" = callPackage
     ({ mkDerivation, base, base-compat, blaze-html, blaze-markup
      , bytestring, clientsession, cmdargs, conduit-extra, data-default
      , directory, filepath, hjsmin, hledger, hledger-lib, hspec
@@ -92608,11 +92653,9 @@ self: {
          wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form
          yesod-static yesod-test
        ];
-       jailbreak = true;
        homepage = "http://hledger.org";
        description = "Web interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlibBladeRF" = callPackage
@@ -97883,18 +97926,18 @@ self: {
      }:
      mkDerivation {
        pname = "hsignal";
-       version = "0.2.7.2";
-       sha256 = "287c864a0e375f9ebbfa52d5c0be13e94441cdb4b2c56f8105bef60426192934";
+       version = "0.2.7.4";
+       sha256 = "290436ca76d13a4435da0b33d20a69663d955abcf361661cf9835e7eedb4f53a";
        libraryHaskellDepends = [
          array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats
          hstatistics mtl storable-complex vector
        ];
        librarySystemDepends = [ blas liblapack ];
        libraryPkgconfigDepends = [ gsl ];
-       prePatch = "rm -v Setup.lhs";
        homepage = "http://code.haskell.org/hsignal";
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; 
          inherit (pkgs) liblapack;};
 
@@ -98456,8 +98499,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsparql";
-       version = "0.2.6";
-       sha256 = "84aacf733c639e90b936f2497911e1c43bad1a9fe6d118870d90fff31fb9eded";
+       version = "0.2.7";
+       sha256 = "0f00e2d8a1294da1e60077b5da641a2f089326eaeb8766eb6e2eb1622328b6a7";
        libraryHaskellDepends = [
          base bytestring HTTP MissingH mtl network network-uri rdf4h text
          xml
@@ -106036,6 +106079,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "imperative-edsl-vhdl" = callPackage
+    ({ mkDerivation, base, bytestring, constraints, containers
+     , language-vhdl, mtl, operational-alacarte, pretty
+     }:
+     mkDerivation {
+       pname = "imperative-edsl-vhdl";
+       version = "0.2.0.1";
+       sha256 = "cafdc2e541b1b9937c40a985e6047999aa254e27208d04b42583b3bdfbc69808";
+       libraryHaskellDepends = [
+         base bytestring constraints containers language-vhdl mtl
+         operational-alacarte pretty
+       ];
+       description = "Deep embedding of VHDL programs with code generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "implicit" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg
      , bytestring, containers, deepseq, directory, filepath, JuicyPixels
@@ -115672,7 +115732,6 @@ self: {
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "levmar-chart" = callPackage
@@ -119183,6 +119242,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lol" = callPackage
+    ({ mkDerivation, arithmoi, base, constraints, containers
+     , data-default, deepseq, MonadRandom, mtl, numeric-prelude
+     , QuickCheck, random, reflection, repa, singletons, storable-record
+     , storable-tuple, tagged-transformer, test-framework
+     , test-framework-quickcheck2, th-desugar, time, transformers
+     , type-natural, vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "lol";
+       version = "0.0.1.0";
+       sha256 = "082cf73496f78034faf3cf3ce59fd1c5c5bd1a5b8c629b5337d414912dd4a746";
+       revision = "1";
+       editedCabalFile = "fb4ef5bbb88c8068978b2914e86c507e6b47d5e120e00be6ea697b7d0db218e6";
+       libraryHaskellDepends = [
+         arithmoi base constraints containers data-default deepseq
+         MonadRandom mtl numeric-prelude QuickCheck random reflection repa
+         singletons storable-record storable-tuple tagged-transformer
+         th-desugar transformers type-natural vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         base constraints MonadRandom QuickCheck repa test-framework
+         test-framework-quickcheck2 time type-natural vector
+       ];
+       homepage = "https://github.com/cpeikert/Lol";
+       description = "A library for lattice cryptography";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "loli" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default, hack
      , hack-contrib, mps, mtl, template, utf8-string
@@ -131850,6 +131938,7 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nixos-types" = callPackage
@@ -148038,6 +148127,7 @@ self: {
        ];
        description = "Program for picking a random file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random_1_0_1_1" = callPackage
@@ -148668,14 +148758,14 @@ self: {
   "rdf4h" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, fgl, hashable, HTTP, HUnit, hxt, knob, network
-     , network-uri, parsec, QuickCheck, test-framework
+     , network-uri, parsec, QuickCheck, safe, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text
      , text-binary, unordered-containers
      }:
      mkDerivation {
        pname = "rdf4h";
-       version = "1.3.3";
-       sha256 = "5c45ee2f0658340ef1a35982c0aff0f9eafdbe0733d8af8d0ae1257398cac46a";
+       version = "1.3.4";
+       sha256 = "27a34de1a2ce13dc0c9d91a79de5d53484a1209450d4bdc370ae4db56e5a01f3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -148687,8 +148777,8 @@ self: {
          base bytestring containers network network-uri text
        ];
        testHaskellDepends = [
-         base bytestring containers HUnit knob network network-uri
-         QuickCheck test-framework test-framework-hunit
+         base bytestring containers directory HUnit knob network network-uri
+         QuickCheck safe test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/robstewart57/rdf4h";
@@ -156361,8 +156451,10 @@ self: {
        libraryHaskellDepends = [
          base dimensional numtype science-constants
        ];
+       jailbreak = true;
        description = "Mathematical/physical/chemical constants";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scientific_0_3_3_3" = callPackage
@@ -157123,6 +157215,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
+  "sdl2_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
+     , StateVar, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "sdl2";
+       version = "2.1.0";
+       sha256 = "87310ae520e585a4d1b23fda19f8dfe6794a54213007184707c09fe0c4c9d085";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring exceptions linear StateVar text transformers vector
+       ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.3).";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2;};
+
   "sdl2-cairo" = callPackage
     ({ mkDerivation, base, cairo, linear, mtl, random, sdl2, time }:
      mkDerivation {
@@ -158014,6 +158126,7 @@ self: {
        ];
        description = "An implementation of semver and semantic version ranges";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sendfile" = callPackage
@@ -161531,22 +161644,18 @@ self: {
      }) {};
 
   "signals" = callPackage
-    ({ mkDerivation, array, base, constraints, containers, data-reify
-     , exception-mtl, exception-transformers, language-c-quote
-     , mainland-pretty, mtl, operational
+    ({ mkDerivation, base, containers, hashable, imperative-edsl-vhdl
+     , language-vhdl, mtl, observable-sharing, operational-alacarte
      }:
      mkDerivation {
        pname = "signals";
-       version = "0.0.0.1";
-       sha256 = "428760c52e6c2a335e3f32b189c6c22b6e178b838ae724d177439aed7bdc858a";
+       version = "0.2.0.2";
+       sha256 = "2dc14b0a4f9c20efb16d00be1f6cc6e1aa0a586f56c67d3506f14cf12b8ee4aa";
        libraryHaskellDepends = [
-         array base constraints containers data-reify exception-mtl
-         exception-transformers language-c-quote mainland-pretty mtl
-         operational
+         base containers hashable imperative-edsl-vhdl language-vhdl mtl
+         observable-sharing operational-alacarte
        ];
-       jailbreak = true;
-       homepage = "https://github.com/markus-git/signals";
-       description = "Stream Processing for Embedded Domain Specific Languages";
+       description = "Synchronous signal processing for DSLs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -162467,7 +162576,6 @@ self: {
        homepage = "https://github.com/AndrasKovacs/singleton-nats";
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singletons_1_0" = callPackage
@@ -170434,8 +170542,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-core";
-       version = "2.0.0";
-       sha256 = "0f715ec8dbbd1219f8a0f58ab1cbaa60c068e5089cd6cc99c449e11d39747633";
+       version = "2.0.1";
+       sha256 = "5b4bda9b0d6ad787f58f86a0c4959247a2e1f27346a71c227bd6ecae2c4b2f2e";
        libraryHaskellDepends = [
          aeson base bytestring mtl text time transformers
          unordered-containers
@@ -170449,8 +170557,8 @@ self: {
     ({ mkDerivation, base, stripe-core, stripe-http-streams }:
      mkDerivation {
        pname = "stripe-haskell";
-       version = "2.0.0";
-       sha256 = "6f1b4d8b1678b2ee5de331bedaa016594fd21906dbc434356423b3459b07a5f9";
+       version = "2.0.1";
+       sha256 = "255a813512a564ddcdd82c502b1ed1899cfb7ee729db4c82f9c50e0dd3aa7e3f";
        libraryHaskellDepends = [ base stripe-core stripe-http-streams ];
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
@@ -170458,24 +170566,21 @@ self: {
      }) {};
 
   "stripe-http-streams" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec
-     , http-streams, io-streams, stripe-core, stripe-tests, text
+    ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-streams
+     , io-streams, stripe-core, text
      }:
      mkDerivation {
        pname = "stripe-http-streams";
-       version = "2.0.0";
-       sha256 = "ce6d9b9d95ebfeb719dc67e4d891df93f1deb03705e761879e8a9353bada6250";
+       version = "2.0.1";
+       sha256 = "28c96ecb38d31d04d6fc96334229d079a4dbebc1aaf149df42197bb42fa47c63";
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
          text
        ];
-       testHaskellDepends = [
-         base free HsOpenSSL hspec http-streams stripe-core stripe-tests
-       ];
-       jailbreak = true;
        doCheck = false;
+       description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
-     }) {stripe-tests = null;};
+     }) {};
 
   "strive" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
@@ -170979,6 +171084,7 @@ self: {
        jailbreak = true;
        description = "Toolchain of subleq computer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subnet" = callPackage
@@ -173317,20 +173423,6 @@ self: {
      }) {};
 
   "tagsoup" = callPackage
-    ({ mkDerivation, base, bytestring, containers, text }:
-     mkDerivation {
-       pname = "tagsoup";
-       version = "0.13.4";
-       sha256 = "1c2ae7f88b218763f1e87dd12400a65b1ea393bb728012129f6f681c902a62c1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring containers text ];
-       homepage = "http://community.haskell.org/~ndm/tagsoup/";
-       description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tagsoup_0_13_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "tagsoup";
@@ -173342,7 +173434,6 @@ self: {
        homepage = "http://community.haskell.org/~ndm/tagsoup/";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagsoup-ht" = callPackage
@@ -174547,6 +174638,7 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/template/wiki";
        description = "Process template file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "templatepg" = callPackage
@@ -181677,6 +181769,7 @@ self: {
        homepage = "http://github.com/agrafix/typed-wire#readme";
        description = "WIP: Language idependent type-safe communication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typedquery" = callPackage
@@ -188797,6 +188890,8 @@ self: {
        pname = "wai-transformers";
        version = "0.0.3";
        sha256 = "fe60300420f8e0c2a5ca09f70cf6f731ba1bc495d40209f74e2084b6e45d8c1a";
+       revision = "1";
+       editedCabalFile = "d1b4c6bd7aa9d94ecacab4adc52d3190db0ee55f9e08ae5f1b4752bb4c35d1db";
        libraryHaskellDepends = [ base transformers wai ];
        description = "Simple parameterization of Wai's Application type";
        license = stdenv.lib.licenses.bsd3;

From ed3f952933dc217466c684af549c111ff02bc53f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 31 Oct 2015 11:07:05 +0100
Subject: [PATCH 028/130] configuration-hackage2nix.yaml: update list of broken
 packages

---
 .../haskell-modules/configuration-hackage2nix.yaml   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 47411be5856..6ca05c89143 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3780,7 +3780,6 @@ dont-distribute-packages:
   atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitvec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cacophony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   compensated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-sndfile:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-prim-seq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3789,6 +3788,7 @@ dont-distribute-packages:
   flowdock-rest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   full-text-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-exp-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-mpi:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hfoil:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-mmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3803,10 +3803,10 @@ dont-distribute-packages:
   hsndfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker-ses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imperative-edsl-vhdl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   inline-r:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jacobi-roots:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lagrangian:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  levmar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libssh2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   linda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-circuit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3814,6 +3814,7 @@ dont-distribute-packages:
   manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   netlink:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   oidc-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   parser241:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-numbers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3821,17 +3822,22 @@ dont-distribute-packages:
   polysoup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prologue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   qt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  randfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-sndfile:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sde-solver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  singleton-nats:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semver-range:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   spsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  template-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tip-haskell-frontend:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tip-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   transient:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-trees:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typed-wire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-content-pdf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]

From a9254356d163af27ede1b5ee3b05bb5eb093776f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 31 Oct 2015 11:08:59 +0100
Subject: [PATCH 029/130] haskell-math-functions: trigger re-build to fix
 broken binaries on Hydra

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ca6373ded94..e3017678b10 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -922,4 +922,7 @@ self: super: {
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ];
   });
 
+  # Re-build this package to fix broken binaries on Hydra.
+  math-functions = triggerRebuild super.math-functions 1;
+
 }

From 86a14d9ad436af1673876d9d3ed7c5efb7555497 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Sat, 31 Oct 2015 20:49:15 +0200
Subject: [PATCH 030/130] lightning-python: init at 1.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 292b758b5c0..1c1c8cfe04a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4453,8 +4453,34 @@ let
       homepage = http://github.com/heynemann/libthumbor;
       license = licenses.mit;
     };
-
   };
+
+  lightning = buildPythonPackage rec {
+    version = "1.2.1";
+    name = "lightning-python-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/lightning-python/${name}.tar.gz";
+      sha256 = "3987d7d4a634bdb6db9bcf212cf4d2f72bab5bc039f4f6cbc02c9d01c4ade792";
+    };
+
+    buildInputs = with self; [ pytest ];
+
+    propagatedBuildInputs = with self; [
+      jinja2
+      matplotlib
+      numpy
+      requests
+      six
+    ];
+
+    meta = {
+      description = "A Python client library for the Lightning data visualization server";
+      homepage = http://lightning-viz.org;
+      license = licenses.mit;
+    };
+  };
+
   lti = buildPythonPackage rec {
     version = "0.4.0";
     name = "PyLTI-${version}";

From 51724c5b7d7c542d1d0fdee61d026c66b2d01640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 28 Oct 2015 18:54:45 +0100
Subject: [PATCH 031/130] python cairocffi: hardcode cairo library path

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c646a541351..ff8397aed95 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1873,7 +1873,12 @@ let
       md5 = "e26d06a8d8b16c7210414ce15d453636";
     };
 
-    propagatedBuildInputs = with self; [ cffi ];
+    propagatedBuildInputs = with self; [ pkgs.cairo cffi ];
+
+    patchPhase = ''
+      # Hardcode cairo library path
+      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py
+    '';
 
     meta = {
       homepage = https://github.com/SimonSapin/cairocffi;

From 5aba0536c75560956a5e8e62a7bc4802d47c8786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 28 Oct 2015 18:55:21 +0100
Subject: [PATCH 032/130] python cairosvg: init at 1.0.18

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ff8397aed95..f3abf63ad7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1888,6 +1888,25 @@ let
   };
 
 
+  cairosvg = buildPythonPackage rec {
+    version = "1.0.18";
+    name = "cairosvg-${version}";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/C/CairoSVG/CairoSVG-${version}.tar.gz";
+      sha256 = "01lpm38qp7xlnv8jv7qg48j44p5088dwfsrcllgs5fz355lrfds1";
+    };
+
+    propagatedBuildInputs = with self; [ cairocffi ];
+
+    meta = {
+      homepage = https://cairosvg.org;
+      license = licenses.lgpl3;
+      description = "SVG converter based on Cairo";
+    };
+  };
+
+
   carrot = buildPythonPackage rec {
     name = "carrot-0.10.7";
 

From e6c6b4a765aed6c2fac53dd11f842641aec10631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 28 Oct 2015 18:55:59 +0100
Subject: [PATCH 033/130] python tinycss: init at 0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f3abf63ad7f..e2b5bc87db6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2999,6 +2999,24 @@ let
     };
   };
 
+
+  tinycss = buildPythonPackage rec {
+    name = "tinycss-${version}";
+    version = "0.3";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/t/tinycss/${name}.tar.gz";
+      sha256 = "1pichqra4wk86142hqgvy9s5x6c5k5zhy8l9qxr0620pqk8spbd4";
+    };
+
+    meta = {
+      description = "complete yet simple CSS parser for Python";
+      license = licenses.bsd3;
+      homepage = http://pythonhosted.org/tinycss/;
+    };
+  };
+
+
   cssselect = buildPythonPackage rec {
     name = "cssselect-${version}";
     version = "0.9.1";

From 810fc8dd70001229157d417cc35282ab8bacf423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 28 Oct 2015 18:56:23 +0100
Subject: [PATCH 034/130] python pygal: init at 2.0.8

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2b5bc87db6..fa789ab2a9a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9274,6 +9274,50 @@ let
     preConfigure = "substituteInPlace setup.py --replace /usr/share usr/share";
   };
 
+  pygal = buildPythonPackage ( rec {
+    version = "2.0.8";
+    name = "pygal-${version}";
+
+    patchPhase = ''
+      # Run tests in pygal dir
+      substituteInPlace setup.py \
+        --replace "self.test_args = []" \
+                  "self.test_args = ['-x', 'build/lib/pygal']"
+      # Open unicode files during tests
+      substituteInPlace pygal/test/test_graph.py \
+        --replace "import sys" \
+                  "import sys, io"
+      substituteInPlace pygal/test/test_graph.py \
+        --replace "open(file_name)" \
+                  "io.open(file_name, encoding='utf-8')"
+      # Use explicit integers (for python 3.5)
+      substituteInPlace pygal/colors.py \
+        --replace "'#%x%x%x' % (r / 17, g / 17, b / 17)" \
+                  "'#%x%x%x' % (r // 17, g // 17, b // 17)"
+      substituteInPlace pygal/colors.py \
+        --replace "'#%x%x%x%x' % (r / 17, g / 17, b / 17, a * 15)" \
+                  "'#%x%x%x%x' % (r // 17, g // 17, b // 17, int(a * 15))"
+      substituteInPlace pygal/colors.py \
+        --replace "'#%02x%02x%02x%02x' % (r, g, b, a * 255)" \
+                  "'#%02x%02x%02x%02x' % (r, g, b, int(a * 255))"
+    '';
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/Kozea/pygal/archive/${version}.tar.gz";
+      sha256 = "1lv8avn7pdlxks50sd58shpqnxybf3l79bggy32qnbqczk4j2s0b";
+    };
+
+    buildInputs = with self; [ flask pyquery pytest ];
+    propagatedBuildInputs = with self; [ cairosvg tinycss cssselect ] ++ optionals (!isPyPy) [ lxml ];
+
+    meta = {
+      description = "Sexy and simple python charting";
+      homepage = http://www.pygal.org;
+      license = licenses.lgpl3;
+    };
+  });
+
+
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";
     version = "0.6.6";

From 480a4069f1a856558028fc59ed540ab94513d806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 28 Oct 2015 18:53:03 +0100
Subject: [PATCH 035/130] ssdeep: only run patchelf on linux

---
 pkgs/tools/security/ssdeep/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index a17fc36b013..4f2cf551816 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f";
   };
 
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ patchelf ];
+
   # For some reason (probably a build system bug), the binary isn't
   # properly linked to $out/lib to find libfuzzy.so
-  postFixup = ''
+  postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''
     rp=$(patchelf --print-rpath $out/bin/ssdeep)
     patchelf --set-rpath $rp:$out/lib $out/bin/ssdeep
   '';

From bd09639db17dcd53e6d087a9ca3e0eab3dccffad Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 2 Oct 2015 16:12:41 +0000
Subject: [PATCH 036/130] django-silk: init at 0.5.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 292b758b5c0..1ee8f523c8f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6058,6 +6058,37 @@ let
     };
   };
 
+  django_silk = makeOverridable ({ django ? self.django }: buildPythonPackage rec {
+    name = "django-silk-${version}";
+    version = "0.5.6";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/django-silk/${name}.tar.gz";
+      sha256 = "845abc688738858ce06e993c4b7dbbcfcecf33029e828f143463ff96f9a78947";
+    };
+
+    buildInputs = [ self.mock ];
+
+    propagatedBuildInputs = [ django ] ++
+      (with self; [
+        pygments
+        simplejson
+        dateutil
+        requests2
+        sqlparse
+        jinja2
+        autopep8
+        pytz
+        pillow
+      ]);
+
+    meta = {
+      description = "Silky smooth profiling for the Django Framework";
+      homepage = https://github.com/mtford90/silk;
+      license = licenses.mit;
+    };
+  }) {};
+
   django_taggit = buildPythonPackage rec {
     name = "django-taggit-${version}";
     version = "0.17.0";

From a8c0eab3d02cb86fd08a64ba202d90fc53a3a318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Sat, 31 Oct 2015 21:26:10 +0100
Subject: [PATCH 037/130] gptfdisk: darwin fixes

---
 pkgs/tools/system/gptfdisk/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 00cb6f8dd0c..9306b0e84cc 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -11,6 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "1izazbyv5n2d81qdym77i8mg9m870hiydmq4d0s51npx5vp8lk46";
   };
 
+  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Makefile.mac --replace \
+      "-mmacosx-version-min=10.4" "-mmacosx-version-min=10.6"
+    substituteInPlace Makefile.mac --replace \
+      " -arch i386" ""
+    substituteInPlace Makefile.mac --replace \
+      " -I/opt/local/include -I /usr/local/include -I/opt/local/include" ""
+    substituteInPlace Makefile.mac --replace \
+      "/opt/local/lib/libncurses.a" "${ncurses}/lib/libncurses.dylib"
+  '';
+
+  buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac";
   buildInputs = [ libuuid popt icu ncurses ];
 
   installPhase = ''
@@ -29,6 +41,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = http://www.rodsbooks.com/gdisk/;
     maintainers = with maintainers; [ nckx ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 754e1a285bb480c9058ccd108fd9421d31a544db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Sat, 31 Oct 2015 21:44:58 +0100
Subject: [PATCH 038/130] testdisk: darwin fixes

---
 pkgs/tools/misc/testdisk/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index fd237ac15f4..a80e560b5eb 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -8,14 +8,15 @@ stdenv.mkDerivation {
     sha256 = "0v1jap83f5h99zv01v3qmqm160d36n4ysi0gyq7xzb3mqgmw75x5";
   };
 
-  buildInputs = [ ncurses libjpeg e2fsprogs zlib openssl libuuid ntfs3g ];
+  buildInputs = [ ncurses libjpeg zlib openssl libuuid ]
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs ntfs3g ];
 
   enableParallelBuilding = true;
 
   meta = {
     homepage = http://www.cgsecurity.org/wiki/TestDisk;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.eelco ];
     longDescription = ''
       TestDisk is a program for data recovery, primarily designed to

From 4532d8844763df8ce27fab4bebd3a326691d1041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Sat, 31 Oct 2015 22:00:40 +0100
Subject: [PATCH 039/130] mkvtoolnix: darwin fixes

---
 pkgs/applications/video/mkvtoolnix/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index e3f586a3a0f..ed02850730c 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -6,6 +6,7 @@
 , legacyGUI ? true, wxGTK ? null
 # For now both qt5 and wxwidgets gui's are enabled, if wxwidgets is disabled the
 # build system doesn't install desktop entries, icons, etc...
+, libiconv
 }:
 
 let
@@ -51,7 +52,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     boost expat file flac libebml libmatroska libogg libvorbis xdg_utils zlib
-  ] ++ optional withGUI qt5
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]
+    ++ optional withGUI qt5
     ++ optional legacyGUI wxGTK;
 
   enableParallelBuilding = true;
@@ -69,6 +71,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ codyopel fuuzetsu ];
-    platforms = platforms.unix;
+    platforms = platforms.all;
   };
 }

From b8d9a16eecb82e05cc937aaf07566b0bfa27a36e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 31 Oct 2015 22:01:20 +0100
Subject: [PATCH 040/130] letsencrypt: add 0.0.0.dev20151030

---
 pkgs/tools/admin/letsencrypt/default.nix | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 pkgs/top-level/python-packages.nix       | 63 ++++++++++++++++++++++--
 3 files changed, 111 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/admin/letsencrypt/default.nix

diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix
new file mode 100644
index 00000000000..d20401f8b9d
--- /dev/null
+++ b/pkgs/tools/admin/letsencrypt/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, pythonPackages, fetchurl, dialog }:
+
+let
+  src = fetchurl {
+    url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz";
+    sha256 = "1xr1ii2kfbhspyirwyqlk4vyx88irif92mw02jwfx9mnslk9gral";
+  };
+  version = "0.0.0.dev20151030";
+  acme = pythonPackages.buildPythonPackage rec {
+    name = "acme-${version}";
+    inherit src version;
+
+    propagatedBuildInputs = with pythonPackages; [
+      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock
+      ndg-httpsclient
+    ];
+
+    buildInputs = with pythonPackages; [ nose ];
+
+    sourceRoot = "letsencrypt-${version}/acme";
+  };
+in pythonPackages.buildPythonPackage rec {
+  name = "letsencrypt-${version}";
+  inherit src version;
+
+  propagatedBuildInputs = with pythonPackages; [
+    zope_interface zope_component six requests2 pytz pyopenssl psutil mock acme
+    cryptography configobj pyRFC3339 python2-pythondialog parsedatetime ConfigArgParse
+  ];
+  buildInputs = with pythonPackages; [ nose dialog ];
+
+  patchPhase = ''
+    substituteInPlace letsencrypt/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail"
+  '';
+
+  postInstall = ''
+    for i in $out/bin/*; do
+      wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH" \
+                       --prefix PATH : "${dialog}/bin:$PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/letsencrypt/letsencrypt;
+    description = "ACME client that can obtain certs and extensibly update server configurations";
+    platforms = platforms.unix;
+    maintainers = [ maintainers.iElectric ];
+    license = licenses.apl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c4ae620eca..52d4229d2c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6830,6 +6830,8 @@ let
     libpng = libpng12;
   };
 
+  letsencrypt = callPackage ../tools/admin/letsencrypt { };
+
   lib3ds = callPackage ../development/libraries/lib3ds { };
 
   libaacs = callPackage ../development/libraries/libaacs { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c646a541351..de1ed36b93b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6658,6 +6658,61 @@ let
     };
   });
 
+  python2-pythondialog = buildPythonPackage rec {
+    name = "python2-pythondialog-${version}";
+    version = "3.3.0";
+    disabled = !isPy27;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python2-pythondialog/python2-pythondialog-${version}.tar.gz";
+      sha256 = "1yhkagsh99bfi592ymczf8rnw8rk6n9hdqy3dd98m3yrx8zmjvry";
+    };
+
+    patchPhase = ''
+      substituteInPlace dialog.py ":/bin:/usr/bin" ":$out/bin"
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = "http://pythondialog.sourceforge.net/";
+    };
+  };
+
+  pyRFC3339 = buildPythonPackage rec {
+    name = "pyRFC3339-${version}";
+    version = "0.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyRFC3339/pyRFC3339-${version}.tar.gz";
+      sha256 = "1pp648xsjaw9h1xq2mgwzda5wis2ypjmzxlksc1a8grnrdmzy155";
+    };
+
+    propagatedBuildInputs = with self; [ pytz ];
+    buildInputs = with self; [ nose ];
+  };
+
+  ConfigArgParse = buildPythonPackage rec {
+    name = "ConfigArgParse-${version}";
+    version = "0.9.3";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz";
+      sha256 = "0a984pvv7370yz7zbkl6s6i7yyl9myahx0m9jkjvg3hz5q8mf70l";
+    };
+
+    # no tests in tarball
+    doCheck = false;
+    propagatedBuildInputs = with self; [
+
+    ];
+    buildInputs = with self; [
+
+    ];
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/zorro3/ConfigArgParse";
+    };
+  };
+
   jsonschema = buildPythonPackage (rec {
     version = "2.4.0";
     name = "jsonschema-${version}";
@@ -14066,14 +14121,14 @@ let
 
   pyopenssl = buildPythonPackage rec {
     name = "pyopenssl-${version}";
-    version = "0.14";
+    version = "0.15.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-0.14.tar.gz";
-      sha256 = "0vpfqhng4cky7chliknkxv910iabqbfcxvkjiankh08jkkjvi7d9";
+      url = "https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
+      sha256 = "0wnnq15rhj7fhdcd8ycwiw6r6g3w9f9lcy6cigg8226vsrq618ph";
     };
 
-    # 17 tests failing
+    # 12 tests failing, 26 error out
     doCheck = false;
 
     propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ];

From 7207dd8f1a09aee27f6555e1e91c4648a4bdce5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 31 Oct 2015 22:05:12 +0100
Subject: [PATCH 041/130] typo

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

diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix
index d20401f8b9d..de32d34bde1 100644
--- a/pkgs/tools/admin/letsencrypt/default.nix
+++ b/pkgs/tools/admin/letsencrypt/default.nix
@@ -45,6 +45,6 @@ in pythonPackages.buildPythonPackage rec {
     description = "ACME client that can obtain certs and extensibly update server configurations";
     platforms = platforms.unix;
     maintainers = [ maintainers.iElectric ];
-    license = licenses.apl20;
+    license = licenses.asl20;
   };
 }

From 922bf3986b108b91908bf2d82389cdeae59332ca Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 31 Oct 2015 14:21:56 -0700
Subject: [PATCH 042/130] calibre-server service: add type to libraryDir option

---
 nixos/modules/services/misc/calibre-server.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix
index b8648770ff4..a920aa22ccd 100644
--- a/nixos/modules/services/misc/calibre-server.nix
+++ b/nixos/modules/services/misc/calibre-server.nix
@@ -22,6 +22,7 @@ in
         description = ''
           The directory where the Calibre library to serve is.
           '';
+          type = types.path;
       };
 
     };

From 969ebc3e16f3986d323ee57b24d5b8681b50544c Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 31 Oct 2015 22:57:19 +0100
Subject: [PATCH 043/130] mbuffer: use version variable

---
 pkgs/tools/misc/mbuffer/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index 35681836931..b75b5dfbebd 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -3,10 +3,11 @@
  } :
 
 stdenv.mkDerivation rec {
-  name = "mbuffer-20151012";
+  version = "20151002";
+  name = "mbuffer-${version}";
 
   src = fetchurl {
-    url = "http://www.maier-komor.de/software/mbuffer/mbuffer-20151002.tgz";
+    url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
     sha256 = "04pz70jr7fkdyax7b67g9jr0msl6ff2i8s6fl8zginqz5rrxckqk";
   };
 

From 216fc04c50e0263cf88543e911069aa1b3e48dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Sat, 31 Oct 2015 23:47:24 +0100
Subject: [PATCH 044/130] hackrf: allow on darwin

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

diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index b815884a29c..efe7c96b608 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "An open source SDR platform";
     homepage = http://greatscottgadgets.com/hackrf/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ sjmackenzie the-kenny ];
   };
 }

From 020bd4a723fe8ef3bea73a70bab1f1ff8395a7b3 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 30 Sep 2015 00:33:46 -0700
Subject: [PATCH 045/130] darwin purity: polyml

---
 pkgs/development/compilers/polyml/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 76bb811dd66..276065ad350 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, autoreconfHook}:
 
 let
   version = "5.5.2";
@@ -7,6 +7,12 @@ in
 stdenv.mkDerivation {
   name = "polyml-${version}";
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure.ac --replace stdc++ c++
+  '';
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+
   src = fetchurl {
     url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
     sha256 = "10m680qdad6bd50bav9xjsgmsxw8yxg55vr7grbg0gvykzl2pzbk";

From 42fffee9da91db117bc382dff17890cf78944b54 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 30 Sep 2015 00:34:02 -0700
Subject: [PATCH 046/130] darwin purity: aria2

---
 pkgs/tools/networking/aria2/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix         | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 9909bbf4070..77226ae0be9 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook
 , openssl, c-ares, libxml2, sqlite, zlib, libssh2
+, Security
 }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +13,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ];
+  buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++
+    stdenv.lib.optional stdenv.isDarwin Security;
 
   configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52d4229d2c3..21a12c81db2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -628,7 +628,10 @@ let
 
   arc-gtk-theme = callPackage ../misc/themes/arc { };
 
-  aria2 = callPackage ../tools/networking/aria2 { };
+  aria2 = callPackage ../tools/networking/aria2 {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   aria = aria2;
 
   at = callPackage ../tools/system/at { };

From 93b81871ebcfe60e26f09a266944b44278ce7190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 1 Nov 2015 10:09:37 +0100
Subject: [PATCH 047/130] pythonPackages.kazoo: don't depend on zookeeper at
 build time

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34f50dd2f63..3d2c6efe01d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11308,7 +11308,7 @@ let
 
     # tests take a long time to run and leave threads hanging
     doCheck = false;
-    ZOOKEEPER_PATH = "${pkgs.zookeeper}";
+    #ZOOKEEPER_PATH = "${pkgs.zookeeper}";
 
     meta = with stdenv.lib; {
       homepage = "https://kazoo.readthedocs.org";

From ed1355e0f1ad961139263485f72e9b0c6d9a8d3c Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 1 Nov 2015 11:41:53 +0100
Subject: [PATCH 048/130] cd-discid: do not use INSTALL=/usr/bin/install, as it
 did not build

---
 pkgs/applications/audio/cd-discid/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index ecf88859fc7..7e0c245d357 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
   };
 
-  installFlags = "PREFIX=$(out)";
+  installFlags = "PREFIX=$(out) INSTALL=install";
 
   meta = with stdenv.lib; {
     homepage = http://linukz.org/cd-discid.shtml;

From 68a198f74b5ca4e5d6e48232459702d31269ee84 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 1 Nov 2015 09:19:23 -0200
Subject: [PATCH 049/130] youtube-DL: 2015.08.28 -> 2015.10.24

---
 pkgs/tools/misc/youtube-dl/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 7cc58bee2b7..0395edf5f3f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, buildPythonPackage, zip, ffmpeg
+{ stdenv, fetchurl, buildPythonPackage, makeWrapper, ffmpeg, zip
 , pandoc ? null }:
 
 # Pandoc is required to build the package's man page. Release tarballs
@@ -9,12 +9,12 @@
 # the tool that doesn't have the formatted man page included.
 
 buildPythonPackage rec {
-  name = "youtube-dl-${version}";
-  version = "2015.10.06.2";
+
+  name = "youtube-dl-${meta.version}";
 
   src = fetchurl {
-    url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0pxj1z5ay97iqh086qz7rxlp197py71f2mdmshz8rrhcjd6vw1sr";
+    url = "http://yt-dl.org/downloads/${meta.version}/${name}.tar.gz";
+    sha256 = "1q9srq08vb2yzl81hmjrgqwajckq52fhh9ag2ppbbxjibf91w5gs";
   };
 
   buildInputs = [ makeWrapper zip pandoc ];
@@ -24,7 +24,8 @@ buildPythonPackage rec {
     ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
   meta = with stdenv.lib; {
-    homepage = "http://rg3.github.com/youtube-dl/";
+    version = "2015.10.24";
+    homepage = http://rg3.github.io/youtube-dl/;
     repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";
     longDescription = ''

From 0c754ba8242707b6a7c3df7419e92d505daa066a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Sat, 31 Oct 2015 22:59:34 +0100
Subject: [PATCH 050/130] yara: init at 3.4.0

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

diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
new file mode 100644
index 00000000000..6a5269c03dc
--- /dev/null
+++ b/pkgs/tools/security/yara/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, fetchFromGitHub, autoconf, automake, libtool, pcre
+, withCrypto ? true, openssl
+, enableMagic ? true, file
+, enableCuckoo ? true, jansson
+}:
+
+stdenv.mkDerivation rec {
+  version = "3.4.0";
+  name = "yara-${version}";
+
+  src = fetchFromGitHub {
+    owner = "plusvic";
+    repo = "yara";
+    rev = "v${version}";
+    sha256 = "1rv1xixbjqx1vkcij8r01rq08ncqgy6nn98xvkrpixwvi4fy956s";
+  };
+
+  # FIXME: this is probably not the right way to make it work
+  # make[2]: *** No rule to make target 'libyara/.libs/libyara.a', needed by 'yara'.  Stop.
+  dynamic_library_extension = ""
+    + stdenv.lib.optionalString stdenv.isLinux "so"
+    + stdenv.lib.optionalString stdenv.isDarwin "dylib"
+  ;
+  prePatch = ''
+    cat >staticlibrary.patch <<EOF
+    --- a/Makefile.am 2015-11-01 11:39:12.000000000 +0100
+    +++ b/Makefile.am 2015-11-01 11:45:32.000000000 +0100
+    @@ -12 +12 @@
+    -yara_LDADD = libyara/.libs/libyara.a
+    +yara_LDADD = libyara/.libs/libyara.${dynamic_library_extension}
+    @@ -15 +15 @@
+    -yarac_LDADD = libyara/.libs/libyara.a
+    +yarac_LDADD = libyara/.libs/libyara.${dynamic_library_extension}
+    EOF
+  '';
+  patches = [
+    (fetchurl {
+      url = "https://github.com/plusvic/yara/pull/261.diff";
+      sha256 = "1fkxnk84ryvrjq7p225xvw9pn5gm2bjia2jz38fclwbsaxdi6p3b";
+    })
+    "staticlibrary.patch"
+  ];
+
+  buildInputs = [ autoconf automake libtool pcre]
+    ++ stdenv.lib.optionals withCrypto [ openssl ]
+    ++ stdenv.lib.optionals enableMagic [ file ]
+    ++ stdenv.lib.optionals enableCuckoo [ jansson ]
+  ;
+
+  preConfigure = "./bootstrap.sh";
+
+  configureFlags = ""
+    + stdenv.lib.optionalString withCrypto "--with-crypto "
+    + stdenv.lib.optionalString enableMagic "--enable-magic "
+    + stdenv.lib.optionalString enableCuckoo "--enable-cuckoo "
+  ;
+
+  meta = with stdenv.lib; {
+    description = "The pattern matching swiss knife for malware researchers";
+    homepage    = http://plusvic.github.io/yara/;
+    license     = licenses.asl20;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a613d2ddaed..f23ddf93cf8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15291,6 +15291,8 @@ let
 
   yandex-disk = callPackage ../tools/filesystems/yandex-disk { };
 
+  yara = callPackage ../tools/security/yara { };
+
   zdfmediathk = callPackage ../applications/video/zdfmediathk { };
 
   zopfli = callPackage ../tools/compression/zopfli { };

From 124e832c37312e14cebf573c2ed85188e243d7cb Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 1 Nov 2015 09:35:28 -0200
Subject: [PATCH 051/130] refind: 0.8.4 -> 0.9.2

---
 pkgs/tools/bootloaders/refind/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 896a02be2b5..7a57225ce8e 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -5,12 +5,11 @@ assert (stdenv.system == "x86_64-linux" ||stdenv.system == "i686-linux");
 
 stdenv.mkDerivation rec {
 
-  name = "refind-${version}";
-  srcName = "refind-src-${version}";
-  version = "0.9.2";
+  name = "refind-${meta.version}";
+  srcName = "refind-src-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/refind/${version}/${srcName}.zip";
+    url = "http://downloads.sourceforge.net/project/refind/${meta.version}/${srcName}.zip";
     sha256 = "0ai150rzx20sfl92j6y1p6qnyy0wbmazrlp2fg19acs98qyxl8lh";
   };
 
@@ -18,7 +17,8 @@ stdenv.mkDerivation rec {
 
   HOSTARCH =
     if stdenv.system == "x86_64-linux" then "x64"
-    else if stdenv.system == "i686-linux" then "ia32" else "null";
+    else if stdenv.system == "i686-linux" then "ia32"
+    else "null";
 
   patchPhase = ''
     sed -e 's|-DEFI_FUNCTION_WRAPPER|-DEFI_FUNCTION_WRAPPER -maccumulate-outgoing-args|g' -i Make.common
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       if stdenv.system == "x86_64-linux" then "elf_x86_64_efi.lds"
       else if stdenv.system == "i686-linux" then "elf_ia32_efi.lds" else "null";
     in ''
-      make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib  EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/${ldScript} gnuefi fs_gnuefi
+      make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/${ldScript} gnuefi fs_gnuefi
     '';
 
   installPhase = ''
@@ -94,6 +94,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "0.9.2";
     description = "A graphical {,U}EFI boot manager";
     longDescription = ''
       rEFInd is a graphical boot manager for EFI- and UEFI-based
@@ -116,4 +117,3 @@ stdenv.mkDerivation rec {
   };
 
 }
-# TODO: detect CPU host architecture (HOSTARCH can be ia32 or x64)

From f8cd72d874c688d780472b7d4434d26d9f23a5cd Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Sun, 1 Nov 2015 12:56:25 +0100
Subject: [PATCH 052/130] keybase: 0.7.8 -> 0.8.22

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

diff --git a/pkgs/applications/misc/keybase/default.nix b/pkgs/applications/misc/keybase/default.nix
index fb1c492b48e..dea0e9062df 100644
--- a/pkgs/applications/misc/keybase/default.nix
+++ b/pkgs/applications/misc/keybase/default.nix
@@ -11,11 +11,11 @@ let
 
 in nodePackages.buildNodePackage rec {
   name = "keybase-${version}";
-  version = "0.7.8";
+  version = "0.8.22";
 
   src = [(fetchurl {
     url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz";
-    sha256 = "1ak27bd7jwyss85i7plnfr5al33ykfifqknncyx1ir2r2ldagzc7";
+    sha256 = "1dvwz2iqcybd687hp6zbw6lkpx27vp8ah6kk251147vxvwfjb422";
   })];
 
   deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));

From 215b77fb34147907621076b95da1e988dbc2bc1a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 1 Nov 2015 13:01:54 +0100
Subject: [PATCH 053/130] svtplay-dl: 0.20.2015.10.08 -> 0.20.2015.10.25

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

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 3c73272e4fb..1d5da633061 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "0.20.2015.10.08";
+  version = "0.20.2015.10.25";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "0mf5w4js2q4ahhkv3k6vs88haf02krhyl217cy05nw7wgxlrr5fx";
+    sha256 = "0azai5clc96lhsx4kj5rvp5bhiq4bwgl51r49b9x4i5s1bhfaz40";
   };
 
   pythonPaths = [ pycrypto requests2 ];

From c7adb3d327ac856e0a9feac8511903d83b340a40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 1 Nov 2015 13:04:22 +0100
Subject: [PATCH 054/130] xvkbd: update from 3.6 to 3.7

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

diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 7e570cbd396..035b4fd6ee7 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "xvkbd-${version}";
-  version = "3.6";
+  version = "3.7";
   src = fetchurl {
     url = "http://homepage3.nifty.com/tsato/xvkbd/xvkbd-${version}.tar.gz";
-    sha256 = "1bjvv93xmmjjk6ir95shwrk6aaiqiprwk12npyahfsik4cf58y16";
+    sha256 = "02y9ks9sa4sn3vkbgswjs5qcd85xhwvarnmhg41pq3l2d617cpw9";
   };
 
   buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];

From 0ceec8420cdfa11d24211a048c23fe58197ad7f9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 1 Nov 2015 12:09:33 +0000
Subject: [PATCH 055/130] php: 5.6.14 -> 5.6.15

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 8408a54cab0..2fcab23e9dc 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -295,8 +295,8 @@ in {
   };
 
   php56 = generic {
-    version = "5.6.14";
-    sha256 = "1c1f5dkfifhaxvl4c7cabv339lazd0znj3phbnd87ha12vqrbwin";
+    version = "5.6.15";
+    sha256 = "0f0wplfnclr6ji6r2g5q0rdnp26xi7gxdq51dljrwx2b9mf6980i";
   };
 
   php70 = lib.lowPrio (generic {

From fdf8e4f2c803bd54d0dbc33aef71b920e29e427d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 1 Nov 2015 12:10:17 +0000
Subject: [PATCH 056/130] php70: 7.0.0beta1 -> 7.0.0RC6

---
 pkgs/development/interpreters/php/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 2fcab23e9dc..565a9a73a2f 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -300,9 +300,9 @@ in {
   };
 
   php70 = lib.lowPrio (generic {
-    version = "7.0.0beta1";
-    url = "https://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2";
-    sha256 = "1pj3ysfhswg2r370ivp33fv9zbcl3yvhmxgnc731k08hv6hmd984";
+    version = "7.0.0RC6";
+    url = "https://downloads.php.net/~ab/php-7.0.0RC6.tar.bz2";
+    sha256 = "0q8km0711chwj94d4mjrzdn999yw1vv4k695gj68pk791a6pcsyk";
   });
 
 }

From 4ebfd41fa7ae6a5245d3571d0f7af310f399518c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 1 Nov 2015 12:08:56 +0000
Subject: [PATCH 057/130] lxc: 1.1.3 -> 1.1.4 (security)

fixes CVE-2015-1335
---
 pkgs/os-specific/linux/lxc/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 72707bb7a8a..c35b6bb90e8 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, docbook2x
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x
 , docbook_xml_dtd_45, python3Packages
 
 # Optional Dependencies
@@ -11,13 +11,12 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxc-1.1.3";
+  name = "lxc-${version}";
+  version = "1.1.4";
 
-  src = fetchFromGitHub {
-    owner = "lxc";
-    repo = "lxc";
-    rev = name;
-    sha256 = "109vpkxzkhixfvwfs6qphfbxb7pbk2qx22qc4zbk52d6gl78ygsb";
+  src = fetchurl {
+    url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
+    sha256 = "1p75ff4lnkm7hq26zq09nqbdypl508csk0ix024l7j8v02i2w1wg";
   };
 
   nativeBuildInputs = [

From 1a7643e166ec8c446513efc87b4ad5dbe86a4fd2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 1 Nov 2015 12:10:57 +0000
Subject: [PATCH 058/130] rustRegistry: 2015-10-18 -> 2015-11-01

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index ccbaeeaf8ee..907196d3dbe 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2015-10-18";
-  rev = "f2f3ea941d46aa06422e8ac4543ff7db900fbbe4";
+  version = "2015-11-01";
+  rev = "a0534d1729e07f2bc3fe936342e33ce380dd0735";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "1a4qy5n88hsnjzn52zsi7yq08h2j5qcgaas260wfppy371pv2jlz";
+      sha256 = "0r8kn7ci9r6s6rb4h3qd8xiyl59llwv39db7s42j35fg7z8wbxk0";
   };
 
 in

From ff02152defdbaa693ab9dbda89798c95f0716c6b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 1 Nov 2015 14:15:17 +0100
Subject: [PATCH 059/130] nixos/postgresql: fix extraPlugins example with a
 working one

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

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 06b9c3fbf4c..16e3235eb2c 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -119,7 +119,7 @@ in
       extraPlugins = mkOption {
         type = types.listOf types.path;
         default = [];
-        example = literalExample "pkgs.postgis";
+        example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]";
         description = ''
           When this list contains elements a new store path is created.
           PostgreSQL and the elments are symlinked into it. Then pg_config,

From a027470a69796efbb488db91310b8fe1556420e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 1 Nov 2015 17:43:19 +0100
Subject: [PATCH 060/130] python-dubs: set pythonPath for wrapper

The python.buildEnv wrapper expects that all pythonPackages
have a pythonPath set, so we set to a dummy value here.
---
 pkgs/development/python-modules/dbus/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index 5bcdc54583d..b56ba6eb22e 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -15,6 +15,10 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
 
   doCheck = false; # https://bugs.freedesktop.org/show_bug.cgi?id=57140
 
+  # Set empty pythonPath, so that the package is recognized as a python package
+  # for python.buildEnv
+  pythonPath = [];
+
   meta = {
     description = "Python DBus bindings";
     license = stdenv.lib.licenses.mit;

From eeba31d7b66596dcbd0f8d4aabbb89807a0d1885 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 1 Nov 2015 20:39:46 +0000
Subject: [PATCH 061/130] ipfs: 0.3.8 -> 0.3.9

Built and tested locally.

The changelog is quite large, so I'm going to link it instead:
https://github.com/ipfs/go-ipfs/blob/master/CHANGELOG.md
---
 pkgs/top-level/go-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 01963f24cd8..664daef1a4b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1679,11 +1679,11 @@ let
   };
 
   ipfs = buildFromGitHub{
-    rev = "9c6ec296e396cc6be551c9807ae220fb50dd07d4";
-    date   = "2015-09-23";
+    rev = "43622bd5eed1f62d53d364dc771bbb500939d9e6";
+    date   = "2015-10-30";
     owner  = "ipfs";
     repo   = "go-ipfs";
-    sha256 = "0lmj2s9ihl1a5r8yn6w0lvb8z3n6c9b8wi1yvi77vgzm6b6lfl3a";
+    sha256 = "0g80b65ysj995dj3mkh3lp4v616fzjl7bx2wf14mkxfri4gr5icb";
   };
 
   ldap = buildGoPackage rec {

From 7487aba1a8f2b44d4b13216e9e08364a7f844a69 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Nov 2015 01:14:40 +0300
Subject: [PATCH 062/130] manual: document nginx changes

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 2745fb2cbe4..573b99d4902 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -40,6 +40,20 @@ following incompatible changes:</para>
     will include the Gitit service configuration options.</para>
   </listitem>
 
+  <listitem>
+    <para><command>nginx</command> does not accept flags for enabling and
+    disabling modules anymore. Instead it accepts <literal>modules</literal>
+    argument, which is a list of modules to be built in. All modules now
+    reside in <literal>nginxModules</literal> set. Example configuration:
+
+<programlisting><![CDATA[
+nginx.override {
+  modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
+}
+]]></programlisting>
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 </section>

From 2c40f8bb8a69447f0bffafa08ef5c81f2d7d2c42 Mon Sep 17 00:00:00 2001
From: Daniel Peebles <copumpkin@users.noreply.github.com>
Date: Sun, 1 Nov 2015 19:18:32 -0500
Subject: [PATCH 063/130] Update the logo to match front page of nixos.org

Seems like the community was in support of changing it, and someone went and changed it on the homepage, so we might as well stay consistent.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 055a219462e..7df25bb5409 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[<img src="http://nixos.org/logo/nixos-hires.png" width="500px" alt="logo" />](https://nixos.org/nixos)
+[<img src="http://nixos.org/logo/nixos-logo-only-hires.png" width="500px" alt="logo" />](https://nixos.org/nixos)
 
 [![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs)
 [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs)

From ce12ce1488444399fb5d49aa195c6ae04c5115bc Mon Sep 17 00:00:00 2001
From: Daniel Peebles <copumpkin@users.noreply.github.com>
Date: Sun, 1 Nov 2015 19:20:05 -0500
Subject: [PATCH 064/130] Whoops, revert my last change

Turns out it was already up to date and I just had a stale cache!
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7df25bb5409..055a219462e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[<img src="http://nixos.org/logo/nixos-logo-only-hires.png" width="500px" alt="logo" />](https://nixos.org/nixos)
+[<img src="http://nixos.org/logo/nixos-hires.png" width="500px" alt="logo" />](https://nixos.org/nixos)
 
 [![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs)
 [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs)

From d973931c9a7a48fbb50bc902195294e89ab44839 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 29 Oct 2015 14:56:48 +0100
Subject: [PATCH 065/130] netsniff-ng 0.5.9-{121-gd91abbd -> 130-ga81b515}

For new --no-geoip option.
---
 pkgs/tools/networking/netsniff-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 9b77cd1ea58..3f29a11f906 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-121-gd91abbd"; in
+let version = "0.5.9-130-ga81b515"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "d91abbd912399a1d29cc77e4be7b7d6f94014180";
-    sha256 = "1smnmnjr9s4xlm2pc4l2dfc304b4acl6dsyi1gnprrr9amrwg798";
+    rev = "a81b515484828e0cff848fb7689d4a4b77f020d8";
+    sha256 = "0p65s9lpifagnb6mbw2la7zx2spckizd0pn5mp2zszn1nda5w0rq";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

From 2cb1ea1ff35c8b4ffdeddcfde91dadbd3b22cc18 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 29 Oct 2015 15:26:24 +0100
Subject: [PATCH 066/130] gparted: add hdparm dependency

Required to display serial numbers in the "Device Information" view.
---
 pkgs/tools/misc/gparted/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 01154d01e7c..fd6920e623d 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, intltool, gettext, makeWrapper
 , parted, gtk, glib, libuuid, pkgconfig, gtkmm, libxml2, hicolor_icon_theme
-, utillinux
+, hdparm, utillinux
 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/sbin/gpartedbin \
-      --prefix PATH : "${utillinux}/bin"
+      --prefix PATH : "${hdparm}/bin:${utillinux}/bin"
   '';
 
   meta = with stdenv.lib; {

From 4435e317e9afab2b2f9b7531df2ffed61fe3fb8a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 2 Nov 2015 01:47:07 +0100
Subject: [PATCH 067/130] geolite-legacy 2015-10-27 -> 2015-11-02

---
 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 3df88b201fc..26b2b6f394a 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-10-27";
+  version = "2015-11-02";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "0jdgfcy90mk7q25rhb8ymnddkskmp2cmyzmbjr3ij0zvbbpzxl4i";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "1qz3hw4n3rs1c94iixshp0sq2rppk8aklp3al9r136kjp4cswbzc";
+    "1k747llmralv2n2krfc1v9f8vdjc3ih3xsgf6g1y60cr78sl197p";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1rmagwjnwsz75nscy7zsha6v4gd3lpqk3p8jy448d4g6l3w3ww1s";
+    "1ppsn39c3n9llskynwbainy5wx6cl3qmhp6ifsylk0ac3jcdr7b9";
 
   meta = with stdenv.lib; {
     inherit version;

From 8ba089c5ae1b0bba53629318bc4480dec99f4925 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 23 Oct 2015 21:00:52 +0300
Subject: [PATCH 068/130] darwin: ipython: fix build inputs for darwin

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f9c9a6698f1..116751155fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7932,6 +7932,10 @@ let
       sha256 = "2fd276c407fb0b29e5d4884a7029a2c27fef0a06fd7a34924cce69b7cc43f4da";
     };
 
+    prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace setup.py --replace "'gnureadline'" " "
+    '';
+
     buildInputs = with self; [nose] ++ optionals isPy27 [mock];
 
     propagatedBuildInputs = with self;

From e8daff21576a98c3c2977b20518cb1c1e26c8705 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 23 Oct 2015 20:58:38 +0300
Subject: [PATCH 069/130] darwin: appnope: init at 0.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 116751155fd..7d097b71edf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -523,10 +523,15 @@ let
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/appnope/${name}.tar.gz";
-      sha256 = "0wgdwp5v7r4g2bss8vbdxah12hsy2mvzxh3sil9s4iskjbz5z6cb";
+      sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71";
     };
 
-    meta.platforms = platforms.darwin;
+    meta = {
+      description = "Disable App Nap on OS X";
+      homepage    = https://pypi.python.org/pypi/appnope;
+      platforms   = platforms.darwin;
+      license     = licenses.bsd3;
+    };
   };
 
   apsw = buildPythonPackage rec {

From 02e14c4ffa9b02b0aa6f5d9982532e5aa723f3e3 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 23 Oct 2015 21:00:03 +0300
Subject: [PATCH 070/130] jupyter_console: init at 4.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d097b71edf..c0f6dadd416 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4528,6 +4528,29 @@ let
     };
   };
 
+  jupyter_console = buildPythonPackage rec {
+    version = "4.0.3";
+    name = "jupyter_console-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jupyter_console/jupyter_console-4.0.3.tar.gz";
+      sha256 = "555be6963a8f6431fbe1d424c7ffefee90824758058e4c9a2ab3aa045948eb85";
+    };
+
+    propagatedBuildInputs = with self; [
+      jupyter_client
+      ipython
+      ipykernel
+    ];
+
+    meta = {
+      description = "Jupyter terminal console";
+      homepage = "http://jupyter.org/";
+      license = licenses.bsd3;
+      platforms = platforms.all;
+    };
+  };
+
   lti = buildPythonPackage rec {
     version = "0.4.0";
     name = "PyLTI-${version}";

From 9529b6f11f9590da24413354a8db61711645d679 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 23 Oct 2015 21:00:20 +0300
Subject: [PATCH 071/130] jupyter: init at 1.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0f6dadd416..ed71333eb3d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4528,12 +4528,38 @@ let
     };
   };
 
+  jupyter = buildPythonPackage rec {
+    version = "1.0.0";
+    name = "jupyter-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jupyter/${name}.tar.gz";
+      sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f";
+    };
+
+    propagatedBuildInputs = with self; [
+      notebook
+      qtconsole
+      jupyter_console
+      nbconvert
+      ipykernel
+      ipywidgets
+    ];
+
+    meta = {
+      description = "Installs all the Jupyter components in one go";
+      homepage = "http://jupyter.org/";
+      license = licenses.bsd3;
+      platforms = platforms.all;
+    };
+  };
+
   jupyter_console = buildPythonPackage rec {
     version = "4.0.3";
     name = "jupyter_console-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/j/jupyter_console/jupyter_console-4.0.3.tar.gz";
+      url = "https://pypi.python.org/packages/source/j/jupyter_console/${name}.tar.gz";
       sha256 = "555be6963a8f6431fbe1d424c7ffefee90824758058e4c9a2ab3aa045948eb85";
     };
 

From 9c2eb52140acd2cb361706c8ec7c7d4da4a74086 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Nov 2015 10:53:31 +0100
Subject: [PATCH 072/130] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20150922-27-g14f44af using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/296838820efbbdc15eb6578aca5c56c585e0e8eb
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/cbced5bc0e764a895b04245021b2156331927737
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/4622b913dcfa6d442d875c8604a87cc79884f74c
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/05c38f5cda81680f98e751a37a66f5c1f2730789
---
 .../haskell-modules/configuration-lts-0.0.nix |   5 +
 .../haskell-modules/configuration-lts-0.1.nix |   5 +
 .../haskell-modules/configuration-lts-0.2.nix |   5 +
 .../haskell-modules/configuration-lts-0.3.nix |   5 +
 .../haskell-modules/configuration-lts-0.4.nix |   5 +
 .../haskell-modules/configuration-lts-0.5.nix |   5 +
 .../haskell-modules/configuration-lts-0.6.nix |   5 +
 .../haskell-modules/configuration-lts-0.7.nix |   5 +
 .../haskell-modules/configuration-lts-1.0.nix |   5 +
 .../haskell-modules/configuration-lts-1.1.nix |   5 +
 .../configuration-lts-1.10.nix                |   5 +
 .../configuration-lts-1.11.nix                |   5 +
 .../configuration-lts-1.12.nix                |   5 +
 .../configuration-lts-1.13.nix                |   5 +
 .../configuration-lts-1.14.nix                |   5 +
 .../configuration-lts-1.15.nix                |   5 +
 .../haskell-modules/configuration-lts-1.2.nix |   5 +
 .../haskell-modules/configuration-lts-1.4.nix |   5 +
 .../haskell-modules/configuration-lts-1.5.nix |   5 +
 .../haskell-modules/configuration-lts-1.7.nix |   5 +
 .../haskell-modules/configuration-lts-1.8.nix |   5 +
 .../haskell-modules/configuration-lts-1.9.nix |   5 +
 .../haskell-modules/configuration-lts-2.0.nix |   5 +
 .../haskell-modules/configuration-lts-2.1.nix |   5 +
 .../configuration-lts-2.10.nix                |   5 +
 .../configuration-lts-2.11.nix                |   5 +
 .../configuration-lts-2.12.nix                |   5 +
 .../configuration-lts-2.13.nix                |   5 +
 .../configuration-lts-2.14.nix                |   5 +
 .../configuration-lts-2.15.nix                |   5 +
 .../configuration-lts-2.16.nix                |   5 +
 .../configuration-lts-2.17.nix                |   5 +
 .../configuration-lts-2.18.nix                |   5 +
 .../configuration-lts-2.19.nix                |   5 +
 .../haskell-modules/configuration-lts-2.2.nix |   5 +
 .../configuration-lts-2.20.nix                |   5 +
 .../configuration-lts-2.21.nix                |   5 +
 .../configuration-lts-2.22.nix                |   5 +
 .../haskell-modules/configuration-lts-2.3.nix |   5 +
 .../haskell-modules/configuration-lts-2.4.nix |   5 +
 .../haskell-modules/configuration-lts-2.5.nix |   5 +
 .../haskell-modules/configuration-lts-2.6.nix |   5 +
 .../haskell-modules/configuration-lts-2.7.nix |   5 +
 .../haskell-modules/configuration-lts-2.8.nix |   5 +
 .../haskell-modules/configuration-lts-2.9.nix |   5 +
 .../haskell-modules/configuration-lts-3.0.nix |   5 +
 .../haskell-modules/configuration-lts-3.1.nix |   5 +
 .../configuration-lts-3.10.nix                |   5 +
 .../configuration-lts-3.11.nix                |   5 +
 .../haskell-modules/configuration-lts-3.2.nix |   5 +
 .../haskell-modules/configuration-lts-3.3.nix |   5 +
 .../haskell-modules/configuration-lts-3.4.nix |   5 +
 .../haskell-modules/configuration-lts-3.5.nix |   5 +
 .../haskell-modules/configuration-lts-3.6.nix |   5 +
 .../haskell-modules/configuration-lts-3.7.nix |   5 +
 .../haskell-modules/configuration-lts-3.8.nix |   5 +
 .../haskell-modules/configuration-lts-3.9.nix |   5 +
 .../haskell-modules/hackage-packages.nix      | 220 ++++++++++++++++--
 58 files changed, 484 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 2eb6e83b9f2..adaf80820d3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1901,6 +1901,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5858,6 +5859,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5952,6 +5954,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6244,6 +6247,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -7025,6 +7029,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 6f48792bd07..8081c2aa099 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1901,6 +1901,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5857,6 +5858,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5951,6 +5953,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6243,6 +6246,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -7024,6 +7028,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index ae9963e7b7b..89e59ad9b03 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1901,6 +1901,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5857,6 +5858,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5951,6 +5953,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6243,6 +6246,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -7024,6 +7028,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 6b0a8885ba7..75d9e942472 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1901,6 +1901,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5857,6 +5858,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5951,6 +5953,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6243,6 +6246,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -7024,6 +7028,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 2cddc6233f4..1e1c2dec426 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1901,6 +1901,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5854,6 +5855,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5948,6 +5950,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6240,6 +6243,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -7020,6 +7024,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index eb721a392f8..53b0cdc1c4c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1901,6 +1901,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5854,6 +5855,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5948,6 +5950,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6240,6 +6243,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -7020,6 +7024,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index b8c40ed984c..924a2d52df5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1898,6 +1898,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5849,6 +5850,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5943,6 +5945,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6235,6 +6238,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -7014,6 +7018,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index e891769b705..aa69451ffbc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1898,6 +1898,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5849,6 +5850,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5943,6 +5945,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6235,6 +6238,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -7014,6 +7018,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 79a809ca0e9..e518a1aa37a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1891,6 +1891,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5837,6 +5838,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5931,6 +5933,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6222,6 +6225,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6999,6 +7003,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index a7172b7006c..ef65b26277e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1889,6 +1889,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5824,6 +5825,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5918,6 +5920,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6209,6 +6212,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6986,6 +6990,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 7699a1407b7..38d31290e69 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1885,6 +1885,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5799,6 +5800,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5893,6 +5895,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6181,6 +6184,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6955,6 +6959,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index ecebce15317..2bf6a1ac5b9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1885,6 +1885,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5795,6 +5796,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5889,6 +5891,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6177,6 +6180,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6950,6 +6954,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index ec1edf6a3c8..364ee886a35 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1885,6 +1885,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5794,6 +5795,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5888,6 +5890,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6176,6 +6179,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6949,6 +6953,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index df8bfe07113..b12f6f74a92 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1885,6 +1885,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5792,6 +5793,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5886,6 +5888,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6174,6 +6177,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6947,6 +6951,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index edce63dcc53..ca896092bf4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1883,6 +1883,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5785,6 +5786,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5879,6 +5881,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6167,6 +6170,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6939,6 +6943,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index d97413156b4..58a3fde7d4e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1882,6 +1882,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5778,6 +5779,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5872,6 +5874,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6160,6 +6163,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6930,6 +6934,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index bb7c5af4eef..b94d90e61a7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1889,6 +1889,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5821,6 +5822,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5915,6 +5917,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6205,6 +6208,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6980,6 +6984,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 5199b16dd74..8ee72f2c61f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1888,6 +1888,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5817,6 +5818,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5911,6 +5913,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6200,6 +6203,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6975,6 +6979,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 68be00d2c5f..1cc39d7046e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1887,6 +1887,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5815,6 +5816,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5909,6 +5911,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6198,6 +6201,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6973,6 +6977,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index fbd211e66f4..0484866743d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1887,6 +1887,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5809,6 +5810,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5903,6 +5905,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6192,6 +6195,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6967,6 +6971,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index afbd978fc49..0ae90e9762d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1887,6 +1887,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5804,6 +5805,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5898,6 +5900,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6187,6 +6190,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6962,6 +6966,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 77cbc3f352f..c5c6845d7f1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1887,6 +1887,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5802,6 +5803,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5896,6 +5898,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6184,6 +6187,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6959,6 +6963,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = dontDistribute super."servant-server";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 8fdbc66faa7..bebc7f680cc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1867,6 +1867,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5718,6 +5719,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5812,6 +5814,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6097,6 +6100,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6865,6 +6869,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index cb9ed387e4e..5ee5d91fd30 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1866,6 +1866,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5716,6 +5717,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5810,6 +5812,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6095,6 +6098,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6863,6 +6867,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index b899570f5d1..0a0184518ec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1855,6 +1855,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5674,6 +5675,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5768,6 +5770,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6049,6 +6052,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6811,6 +6815,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 7b5a485bd96..22949587eee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1854,6 +1854,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5668,6 +5669,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5762,6 +5764,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6042,6 +6045,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6803,6 +6807,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 9e002ffece8..9bca7c5ea0f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1854,6 +1854,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5668,6 +5669,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5762,6 +5764,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6042,6 +6045,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6802,6 +6806,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index c3f0bbda4ef..78059258c01 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1854,6 +1854,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5665,6 +5666,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5759,6 +5761,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6039,6 +6042,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6799,6 +6803,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 4f99f57f54d..1d0c9ce9cf3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1853,6 +1853,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5662,6 +5663,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5756,6 +5758,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6036,6 +6039,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6795,6 +6799,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index cb1b6382dd7..36217dafb9c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1853,6 +1853,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5657,6 +5658,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5751,6 +5753,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6031,6 +6034,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6790,6 +6794,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index d11635a3c9b..53068356ef8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1851,6 +1851,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5647,6 +5648,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5741,6 +5743,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6021,6 +6024,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6780,6 +6784,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 001c735c364..bd80525fedd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1848,6 +1848,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5639,6 +5640,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5732,6 +5734,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6012,6 +6015,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6770,6 +6774,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index bf8b0b00632..5afb0f3ecdd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1844,6 +1844,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5631,6 +5632,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5724,6 +5726,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6003,6 +6006,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6761,6 +6765,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index ece2b001c30..b5ab0d2b80b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1844,6 +1844,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5628,6 +5629,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5721,6 +5723,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6000,6 +6003,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6758,6 +6762,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 36e03ba986b..d54e986912a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1863,6 +1863,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5712,6 +5713,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5806,6 +5808,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6090,6 +6093,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6858,6 +6862,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 1a8231e1385..c1d50e7d44b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1844,6 +1844,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5624,6 +5625,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5717,6 +5719,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5995,6 +5998,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6753,6 +6757,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index c61479556c8..9703c38c837 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1844,6 +1844,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5622,6 +5623,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5715,6 +5717,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5992,6 +5995,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6748,6 +6752,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index c97272ca493..fd6dd18f6ab 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1843,6 +1843,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5618,6 +5619,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5711,6 +5713,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5988,6 +5991,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6744,6 +6748,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index adf28b1dfb2..a710ef7e984 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1863,6 +1863,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5710,6 +5711,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5804,6 +5806,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6088,6 +6091,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6856,6 +6860,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 3983e19a68b..0d6cca2a967 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1862,6 +1862,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5708,6 +5709,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5802,6 +5804,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6084,6 +6087,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6851,6 +6855,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 18d644afd39..84082f4e7f3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1862,6 +1862,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5706,6 +5707,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5800,6 +5802,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6082,6 +6085,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6849,6 +6853,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 78ffac08757..ec154121c03 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1859,6 +1859,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5700,6 +5701,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5794,6 +5796,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6076,6 +6079,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6843,6 +6847,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 6957a09c3a2..f0b2c6cadc4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1858,6 +1858,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5699,6 +5700,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5793,6 +5795,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6075,6 +6078,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6842,6 +6846,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index d1a36cde252..a5d89fa9eaa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1857,6 +1857,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5695,6 +5696,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5789,6 +5791,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6071,6 +6074,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6837,6 +6841,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index dfeb212c4c6..6cd48db564d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1855,6 +1855,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5685,6 +5686,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5779,6 +5781,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -6060,6 +6063,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6825,6 +6829,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_2_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession" = dontDistribute super."serversession";
   "serversession-backend-acid-state" = dontDistribute super."serversession-backend-acid-state";
   "serversession-backend-persistent" = dontDistribute super."serversession-backend-persistent";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index d1a416f4729..50503c6a4da 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1776,6 +1776,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5405,6 +5406,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5495,6 +5497,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5755,6 +5758,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6497,6 +6501,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index ca3baf7785a..35a982ae85f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1773,6 +1773,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5396,6 +5397,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5486,6 +5488,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5745,6 +5748,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6486,6 +6490,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 71552b98178..e1283309035 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1746,6 +1746,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5284,6 +5285,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5373,6 +5375,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5625,6 +5628,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6343,6 +6347,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 479f6ab20a2..dfb50a84329 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1743,6 +1743,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5276,6 +5277,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5365,6 +5367,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5615,6 +5618,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6332,6 +6336,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 50ebb894732..3a978a637a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1770,6 +1770,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5388,6 +5389,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5478,6 +5480,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5736,6 +5739,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6474,6 +6478,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_1";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index da560ba9e00..3b42a33a23d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1768,6 +1768,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5379,6 +5380,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5469,6 +5471,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5727,6 +5730,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6464,6 +6468,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index eefcd11119a..79e7816ae10 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1768,6 +1768,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5378,6 +5379,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5468,6 +5470,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5726,6 +5729,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6462,6 +6466,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 9e7adf2471b..9452454355c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1767,6 +1767,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5365,6 +5366,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5455,6 +5457,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5711,6 +5714,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6445,6 +6449,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index f52ac9b943d..6c91cb3816b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1765,6 +1765,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5345,6 +5346,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5435,6 +5437,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5689,6 +5692,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6421,6 +6425,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 06602beaa29..8d90e3b6d07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1760,6 +1760,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5327,6 +5328,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5417,6 +5419,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5670,6 +5673,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6398,6 +6402,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 48fb42a3689..50a91e7a85e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1756,6 +1756,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5310,6 +5311,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5400,6 +5402,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5653,6 +5656,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6378,6 +6382,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 6b1a6df3d85..f670c3fa8e4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1751,6 +1751,7 @@ self: super: {
   "cap" = dontDistribute super."cap";
   "capped-list" = dontDistribute super."capped-list";
   "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
@@ -5299,6 +5300,7 @@ self: super: {
   "nm" = dontDistribute super."nm";
   "nme" = dontDistribute super."nme";
   "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
   "no-role-annots" = dontDistribute super."no-role-annots";
   "nofib-analyze" = dontDistribute super."nofib-analyze";
   "noise" = dontDistribute super."noise";
@@ -5388,6 +5390,7 @@ self: super: {
   "openexchangerates" = dontDistribute super."openexchangerates";
   "openflow" = dontDistribute super."openflow";
   "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
   "opengles" = dontDistribute super."opengles";
   "openid" = dontDistribute super."openid";
   "openpgp" = dontDistribute super."openpgp";
@@ -5641,6 +5644,7 @@ self: super: {
   "pisigma" = dontDistribute super."pisigma";
   "pit" = dontDistribute super."pit";
   "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
   "pkcs1" = dontDistribute super."pkcs1";
   "pkcs7" = dontDistribute super."pkcs7";
   "pkggraph" = dontDistribute super."pkggraph";
@@ -6365,6 +6369,7 @@ self: super: {
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
   "servant-server" = doDistribute super."servant-server_0_4_4_4";
+  "servant-yaml" = dontDistribute super."servant-yaml";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 96793a2c837..7e6ad2338f1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4770,6 +4770,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Earley_0_10_0_1" = callPackage
+    ({ mkDerivation, base, ListLike, tasty, tasty-hunit
+     , tasty-quickcheck, unordered-containers
+     }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.10.0.1";
+       sha256 = "4d2d3f248bac0acdbcd782d5b6981ea7c2bc3e28b6dc81f7dee8e8fed071869e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ListLike ];
+       executableHaskellDepends = [ base unordered-containers ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Ebnf2ps" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy
      , old-time, unix
@@ -6326,6 +6344,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "GPipe_2_1_3" = callPackage
+    ({ mkDerivation, base, Boolean, containers, exception-transformers
+     , gl, hashtables, linear, transformers
+     }:
+     mkDerivation {
+       pname = "GPipe";
+       version = "2.1.3";
+       sha256 = "dcfd17d26a380cf57ed4e3d95ee7135230212e43914f7dd2ecd0e6c028aacb7f";
+       libraryHaskellDepends = [
+         base Boolean containers exception-transformers gl hashtables linear
+         transformers
+       ];
+       homepage = "http://tobbebex.blogspot.se/";
+       description = "Typesafe functional GPU graphics programming";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GPipe-Collada" = callPackage
     ({ mkDerivation, array, base, containers, GPipe, HaXml, mtl, Vec }:
      mkDerivation {
@@ -39983,6 +40019,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "car-pool" = callPackage
+    ({ mkDerivation, base, blaze-html, containers, digestive-functors
+     , digestive-functors-blaze, digestive-functors-happstack
+     , explicit-exception, happstack-server, non-empty, spreadsheet
+     , text, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "car-pool";
+       version = "0.0.0.1";
+       sha256 = "91428f7fb6f056227281d510777a0f55ac8adc5181ccdeddb5af2c862333ee24";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base blaze-html containers digestive-functors
+         digestive-functors-blaze digestive-functors-happstack
+         explicit-exception happstack-server non-empty spreadsheet text
+         transformers utility-ht
+       ];
+       jailbreak = true;
+       homepage = "http://hub.darcs.net/thielema/car-pool/";
+       description = "Simple web-server for organizing car-pooling for an event";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "caramia" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, gl
      , HUnit, lens, linear, mtl, sdl2, semigroups, test-framework
@@ -40115,8 +40175,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.1";
-       sha256 = "c9df22feb9c18f8572f1d4e4e6635b93b5e0d73127ce011294aded381c9b938c";
+       version = "2.4.1.2";
+       sha256 = "ced56e7203c78207866f98ceae2a36a60fd8b01dd9e174dc35d0b19a915daaca";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
@@ -41362,8 +41422,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.5.9";
-       sha256 = "169f35d12b3a75e3cf172c5a69828ed7bb89905c7ecf12aa9997cfee730d9f3a";
+       version = "6.5.10";
+       sha256 = "4ac59db3268fff0a9f612a589743791c886ade834630116cb48245f42d14b166";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69401,8 +69461,8 @@ self: {
      }:
      mkDerivation {
        pname = "fn";
-       version = "0.1.3.0";
-       sha256 = "a5242c61f9f671347ddaf4c377a6b2844a1126513e3eaca88a032c0254bfb3c2";
+       version = "0.1.3.1";
+       sha256 = "d9ea2a4c39a0185cddb5ca11fcd5489dd18487ea6ef1a81c32ea43333e4eb8df";
        libraryHaskellDepends = [
          base blaze-builder bytestring http-types text wai
        ];
@@ -73076,8 +73136,8 @@ self: {
     ({ mkDerivation, base, ieee754, linear, QuickCheck }:
      mkDerivation {
        pname = "geom2d";
-       version = "0.2.1";
-       sha256 = "c644a0adb3bf02c5ce6681f3002019665fb8c652e61a901c5d03bae72057caca";
+       version = "0.2.2";
+       sha256 = "239ff6b5c7a389022657dd92172fb5ae397c74dc4b0aae15e42cd2b3d3d1543f";
        libraryHaskellDepends = [ base ieee754 linear QuickCheck ];
        testHaskellDepends = [ base ieee754 linear QuickCheck ];
        description = "package for geometry in euklidean 2d space";
@@ -74000,6 +74060,8 @@ self: {
        pname = "ghcid";
        version = "0.3.2";
        sha256 = "c32e02f7ad19feba73cf0e3eba2c48fb14bd90fac9f8044e838d5a4d1405a2cf";
+       revision = "1";
+       editedCabalFile = "58262c601d393d34a65a5e36f2924cd19c18efb7acfefb59544af5acad9160d0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92309,12 +92371,11 @@ self: {
     ({ mkDerivation, base, hledger-lib, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.4";
-       sha256 = "d920233db7cabf47f6b89cca8724b05b4acd940814d2c2567d51772558170bdc";
+       version = "0.2.0.5";
+       sha256 = "437034c916d99bfc13240e0cc7a563bef4029ddda526eb4bf0e452ef29be8e67";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib time ];
-       jailbreak = true;
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
@@ -97937,7 +97998,6 @@ self: {
        homepage = "http://code.haskell.org/hsignal";
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; 
          inherit (pkgs) liblapack;};
 
@@ -108157,8 +108217,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "ireal";
-       version = "0.2.1";
-       sha256 = "aabb8a98710575e46cccfe52d54324d2b89cd0294333d25bdd87870928282845";
+       version = "0.2.3";
+       sha256 = "928294da41708e1036283aee492be120e478c0994998df50af533898c9c9bc73";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Real numbers and intervals with relatively efficient exact arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -114594,6 +114654,8 @@ self: {
        pname = "lattices";
        version = "1.4.1";
        sha256 = "b1148cd7ed7fde0964fa53e5b1c304370291f08cfaa77dab3a6cfb01c8ae34ff";
+       revision = "1";
+       editedCabalFile = "ceeada8cfea894629b6232d6c3367bf182bcc76f9f6c77937d23d02ba8f4345f";
        libraryHaskellDepends = [
          base containers deepseq hashable semigroups tagged universe-base
          universe-reverse-instances unordered-containers void
@@ -129867,8 +129929,8 @@ self: {
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "6.0.0";
-       sha256 = "37d621518c550770a79c8a5ed148be32f97752bf201d9dc4a3df540b1aa31941";
+       version = "6.0.0.1";
+       sha256 = "6d1d4ac4cd11443ecc36ecead0d71426750c65651767caf3d7e4c962462d2fdc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132049,6 +132111,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "no-buffering-workaround" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "no-buffering-workaround";
+       version = "0.1.0.0";
+       sha256 = "8dfa0c40633c7cb59a44a6498652b81d7ef6de1661b61cc7b0e73aceede2daa7";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/arotenberg/no-buffering-workaround#readme";
+       description = "Workaround for GHC bug #2189";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "no-role-annots" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -133905,8 +133979,8 @@ self: {
     ({ mkDerivation, base, GLUT, OpenGL, vector }:
      mkDerivation {
        pname = "opengl-dlp-stereo";
-       version = "0.1.2.5";
-       sha256 = "076a1640f83131f1134328b9d1b8fa0ff9da51527f2d9337f5fceebb55c0d85a";
+       version = "0.1.2.6";
+       sha256 = "fe5b2ead68fdab4c76a35c9d00254a82e5c9468ea79eeed522a6c2b2c6b577d4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base OpenGL vector ];
@@ -133916,6 +133990,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "opengl-spacenavigator" = callPackage
+    ({ mkDerivation, base, data-default, GLUT, OpenGL }:
+     mkDerivation {
+       pname = "opengl-spacenavigator";
+       version = "0.1.2.0";
+       sha256 = "427c68b13a26a942ae6caf90699cef822b507527c465eae8cd8866b6de902e55";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base data-default GLUT OpenGL ];
+       executableHaskellDepends = [ base data-default GLUT OpenGL ];
+       homepage = "https://bitbucket.org/bwbush/opengl-spacenavigator";
+       description = "Library and example for using a SpaceNavigator-compatible 3-D mouse with OpenGL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "opengles" = callPackage
     ({ mkDerivation, base, bytestring, distributive, EGL
      , future-resource, ghc-prim, GLESv2, lens, linear, packer, vector
@@ -141564,6 +141653,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pivotal-tracker" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, either, servant
+     , servant-client, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "pivotal-tracker";
+       version = "0.1.0.1";
+       sha256 = "e9686d2d3537cbe53e1196724d1c55334ce0de02fe4d3e6678fff1fdf3a7ff46";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-casing base servant servant-client text time
+         transformers
+       ];
+       executableHaskellDepends = [
+         base either servant text transformers
+       ];
+       description = "A library and a CLI tool for accessing Pivotal Tracker API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pkcs1" = callPackage
     ({ mkDerivation, base, bytestring, random }:
      mkDerivation {
@@ -152868,6 +152978,8 @@ self: {
        pname = "rest-gen";
        version = "0.19.0.0";
        sha256 = "dc8b6e65acedd598a6592c5b0e92ef0f722b87c01af5c64b6caa30da4318840b";
+       revision = "1";
+       editedCabalFile = "457cc4689cb424f1899fe05b0fbbf254bda408e2fbe6f412581add5c26f4bac1";
        libraryHaskellDepends = [
          aeson base blaze-html Cabal code-builder directory fclabels
          filepath hashable haskell-src-exts HStringTemplate hxt json-schema
@@ -158032,14 +158144,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "semigroups_0_17_0_1" = callPackage
+  "semigroups_0_18" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , nats, tagged, text, unordered-containers
      }:
      mkDerivation {
        pname = "semigroups";
-       version = "0.17.0.1";
-       sha256 = "7930dbd98e023df8485a928ff11e4bee95a002fd41253f14c4447ba34f74773f";
+       version = "0.18";
+       sha256 = "b3c1bd2f42fcf014af8377d492c08e9fc789e9f06e4179772247a22dd2cd4899";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable nats tagged text
          unordered-containers
@@ -159478,6 +159590,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-yaml" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
+     , servant, servant-server, wai, warp, yaml
+     }:
+     mkDerivation {
+       pname = "servant-yaml";
+       version = "0.1.0.0";
+       sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204";
+       libraryHaskellDepends = [
+         base bytestring http-media servant yaml
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring http-media servant servant-server
+         wai warp yaml
+       ];
+       homepage = "https://github.com/phadej/servant-yaml#readme";
+       description = "Servant support for yaml";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "serversession" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , containers, data-default, hashable, hspec, nonce, path-pieces
@@ -174553,6 +174685,27 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "tellbot_0_6_0_4" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, containers
+     , http-conduit, mtl, network, regex-pcre, split, tagsoup, text
+     , time, transformers
+     }:
+     mkDerivation {
+       pname = "tellbot";
+       version = "0.6.0.4";
+       sha256 = "b17a8b6a9bbe77393d0de26cab3e9dfe68d8364cde327abae45ffa35e73dbbbc";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bifunctors bytestring containers http-conduit mtl network
+         regex-pcre split tagsoup text time transformers
+       ];
+       homepage = "https://github.com/phaazon/tellbot";
+       description = "IRC tellbot";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "template" = callPackage
     ({ mkDerivation, base, mtl, text }:
      mkDerivation {
@@ -174947,6 +175100,8 @@ self: {
        pname = "terminal-size";
        version = "0.3.2";
        sha256 = "d737ed86e105fe1217416c4d59a6c10a2523ba86591ffb68001018596aeea66e";
+       revision = "1";
+       editedCabalFile = "9d18011d0c8779a7e928602d6750ca1f7cd069a7a1a08ca59224590bb250a955";
        libraryHaskellDepends = [ base ];
        description = "Get terminal window height and width";
        license = stdenv.lib.licenses.bsd3;
@@ -176745,6 +176900,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-desugar_1_5_5" = callPackage
+    ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
+     , template-haskell, th-lift, th-orphans
+     }:
+     mkDerivation {
+       pname = "th-desugar";
+       version = "1.5.5";
+       sha256 = "db8cfe15c2b1c5b5e6c2105a0a16f409c9eb9b359c2f2c18e440d5562c5d38a3";
+       libraryHaskellDepends = [
+         base containers mtl syb template-haskell th-lift th-orphans
+       ];
+       testHaskellDepends = [
+         base containers hspec HUnit mtl syb template-haskell th-lift
+         th-orphans
+       ];
+       homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar";
+       description = "Functions to desugar Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-expand-syns_0_3_0_4" = callPackage
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
@@ -177179,6 +177355,8 @@ self: {
        pname = "these";
        version = "0.6.1.0";
        sha256 = "a8e9e677b72ab4ea4e922b860abdd5f61ac69cb66e7c9f060f08ac94110f2d0d";
+       revision = "1";
+       editedCabalFile = "93c9372ddb67e8888cdc0069b8ce1bef36df21d8f00c11bb084686c5d571cf8e";
        libraryHaskellDepends = [
          base bifunctors containers data-default-class hashable mtl
          profunctors semigroupoids semigroups transformers

From f25b36df3c93bed65cd8539aafd3c316fec22fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 2 Nov 2015 10:25:11 +0100
Subject: [PATCH 073/130] nixos/jenkins: force .war (re)extraction at start-up

Or else we might run stale Jenkins.
---
 .../services/continuous-integration/jenkins/default.nix      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 7a118ac7207..9bd511ad3ae 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -128,6 +128,11 @@ in {
 
       path = cfg.packages;
 
+      # Force .war (re)extraction, or else we might run stale Jenkins.
+      preStart = ''
+        rm -rf ${cfg.home}/war
+      '';
+
       script = ''
         ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpPort=${toString cfg.port} ${concatStringsSep " " cfg.extraOptions}
       '';

From eeced1bc516ab167929e04855b8241aac511753c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 2 Nov 2015 10:39:16 +0100
Subject: [PATCH 074/130] jenkins: 1.633 -> 1.636

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index c68874cf231..a2abe048f1b 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "1.633";
+  version = "1.636";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "1s5jihq9shscsdazb1c393qab0djms4by5zn3ciylcgvif431n8m";
+    sha256 = "1j6wz5npgsgnkg5xyf3ylrziasxwx5plqr72zwx41a83yvncyx3k";
   };
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";

From 23091d79ac505ce4a3ec6f6c073e09d47e28ed5b Mon Sep 17 00:00:00 2001
From: Matthijs Steen <emailmatthijs@gmail.com>
Date: Fri, 30 Oct 2015 22:12:09 +0100
Subject: [PATCH 075/130] tilda: 1.2.2 -> 1.2.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 94ac7e8cb530a670b3d2badb98c22f209fa1abe2)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/applications/misc/tilda/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index c7a01f2ac1b..bf99f0f5f65 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
 
   name = "tilda-${version}";
-  version = "1.2.2";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
-    sha256 = "1mzly0llsrxpc2yd1hml3gmwm023my2j3aszjw383pp34dab2nl5";
+    sha256 = "1f7b52c5d8cfd9038ad2e41fc633fce935f420fa657ed15e3942722c8570751e";
   };
 
   buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];

From f89ddefd97651fb9716a6b64651db30c0747d080 Mon Sep 17 00:00:00 2001
From: Scott Milliken <scott@deltaex.com>
Date: Sun, 1 Nov 2015 18:27:25 -0800
Subject: [PATCH 076/130] neovim: update to 0.1.0., closes #10787

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

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 252a1e93c64..d70674ca415 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -15,7 +15,7 @@ with stdenv.lib;
 
 let
 
-  version = "2015-10-12";
+  version = "0.1.0";
 
   # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
   neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation {
@@ -63,8 +63,8 @@ let
     name = "neovim-${version}";
 
     src = fetchFromGitHub {
-      sha256 = "1rlybdldz708pz7k0qs2rpm0cjk8ywwyj5s38hyq4mzsswqszdsc";
-      rev = "a3f048ee06dea15490d7b874d295c3fc850cdc51";
+      sha256 = "1704f3dqf5p6hicpzf0pi21n6ymylra9prsm4azvqp86allmvnfx";
+      rev = "c4826c300340a9e4df20964a14650caf64fc1b58";
       repo = "neovim";
       owner = "neovim";
     };

From ad30764d68acd473dc4f08ca7f6f764b38600d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 2 Nov 2015 12:57:01 +0100
Subject: [PATCH 077/130] neovim: fetch by version tag instead of commit hash

/cc #10787.
---
 pkgs/applications/editors/neovim/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index d70674ca415..100c48762b5 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -23,7 +23,7 @@ let
 
     src = fetchFromGitHub {
       sha256 = "0i2h74jrx4fy90sv57xj8g4lbjjg4nhrq2rv6rz576fmqfpllcc5";
-      rev = "20ad1396c178c72873aeeb2870bd726f847acb70";
+      rev = "v${version}";
       repo = "libvterm";
       owner = "neovim";
     };

From 11b123662717ad20c3bb3100503786b35adfb158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 2 Nov 2015 13:03:56 +0100
Subject: [PATCH 078/130] travis-ci: use trusty (has 7.5G ram compared to
 previous 3)

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index dbb04e29ee0..402347d5eda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: python
 python: "3.4"
 sudo: required
+dist: trusty
 before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix
 install: ./maintainers/scripts/travis-nox-review-pr.sh nox
 script: ./maintainers/scripts/travis-nox-review-pr.sh build

From 2bb705da152a5213cbc879b425498f22d86ff341 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Nov 2015 14:32:08 +0100
Subject: [PATCH 079/130] postfix: don't create a symlink inside of
 /var/spool/mail if /var/mail exists already

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

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index e8beba4b358..d1aaebdfdf2 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -380,7 +380,7 @@ in
           ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
           ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
           ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
-          ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/mail
+          ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/
 
           ln -sf "${pkgs.postfix}/etc/postfix/"* /var/postfix/conf
 

From b44df493d325cc10df9ea9f6b6987c432b300fb7 Mon Sep 17 00:00:00 2001
From: Matthijs Steen <emailmatthijs@gmail.com>
Date: Mon, 2 Nov 2015 14:38:34 +0100
Subject: [PATCH 080/130] Added msteen to the list of maintainers.

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b64c236bde3..d674ba60582 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -192,6 +192,7 @@
   mornfall = "Petr Ročkai <me@mornfall.net>";
   MP2E = "Cray Elliott <MP2E@archlinux.us>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
+  msteen = "Matthijs Steen <emailmatthijs@gmail.com>";
   mtreskin = "Max Treskin <zerthurd@gmail.com>";
   mudri = "James Wood <lamudri@gmail.com>";
   muflax = "Stefan Dorn <mail@muflax.com>";

From cddbb0fa4788d9ea19971cbf78f37937f2471020 Mon Sep 17 00:00:00 2001
From: leenaars <michiel.ml@nlnet.nl>
Date: Mon, 2 Nov 2015 15:29:16 +0100
Subject: [PATCH 081/130] Added Linux as confirmed platform

---
 pkgs/games/armagetronad/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index e70d4c7b596..cbbd963f2ee 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation {
     homepage = http://armagetronad.org;
     description = "An multiplayer networked arcade racing game in 3D similar to Tron";
     license = stdenv.lib.licenses.gpl2;
+    platforms = platforms.linux;
   };
 }

From 2d027273836c918c255c73ed959040b8cbc73418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 2 Nov 2015 15:33:32 +0100
Subject: [PATCH 082/130] fix eval

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

diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index cbbd963f2ee..651278b0cf0 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -18,10 +18,10 @@ stdenv.mkDerivation {
   configureFlags ="--disable-etc";
   buildInputs = [SDL SDL_image libxml2 libjpeg mesa zlib];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://armagetronad.org;
     description = "An multiplayer networked arcade racing game in 3D similar to Tron";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     platforms = platforms.linux;
   };
 }

From d68a77e50495acddcb785883650b51a8d8155d67 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Nov 2015 15:35:20 +0100
Subject: [PATCH 083/130] haskellPackages: enable hsparql checks again

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e3017678b10..f372030b38e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -407,7 +407,6 @@ self: super: {
   hs2048 = dontCheck super.hs2048;
   hsbencher = dontCheck super.hsbencher;
   hsexif = dontCheck super.hsexif;
-  hsparql = dontCheck super.hsparql; # https://github.com/robstewart57/hsparql/issues/15
   hspec-server = dontCheck super.hspec-server;
   HTF = dontCheck super.HTF;
   HTF_0_12_2_3 = dontCheck super.HTF_0_12_2_3;
@@ -448,7 +447,6 @@ self: super: {
   punycode = dontCheck super.punycode;
   pwstore-cli = dontCheck super.pwstore-cli;
   quantities = dontCheck super.quantities;
-  rdf4h = dontCheck super.rdf4h; # https://github.com/robstewart57/rdf4h/issues/32
   redis-io = dontCheck super.redis-io;
   rethinkdb = dontCheck super.rethinkdb;
   Rlang-QQ = dontCheck super.Rlang-QQ;

From 2ede3e6dddf6610b284ad4cc80723af2a7cbd324 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 2 Nov 2015 02:04:41 +0100
Subject: [PATCH 084/130] rustfmt: 2015-10-17 -> 2015-10-28

... which also fixes the build.
Also, I've switched the compiler to the stable channel since rustfmt
supports it now.
---
 pkgs/development/tools/rust/rustfmt/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index c72668540b3..876734a3e11 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, rustUnstable, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
 
-with rustUnstable;
+with rustPlatform;
 
 buildRustPackage rec {
-  name = "rustfmt-git-2015-10-17";
+  name = "rustfmt-git-2015-10-28";
   src = fetchFromGitHub {
     owner = "nrc";
     repo = "rustfmt";
-    rev = "36c9a3acf95a036f3f9fa72ff3fe175fba55e20b";
-    sha256 = "1vjnfq3al73qljalr2rvymabcksx6y690gg5r9kgz1lnizlb7yrz";
+    rev = "bd0fdbb364ba69c69b867f96bc1ea9b59177fb76";
+    sha256 = "07yxz409yxgwrzm46fhq6kyn9igznb7481kxyk90ngmhdd0a5mfd";
   };
 
-  depsSha256 = "0vzpq58vfswdwdm2bk44ynk43cmwdxppcbkvpjyfa6sjs2s5x8n9";
+  depsSha256 = "0qs6ilpvcrvcmxg7a94rbg9rql1hxfljy6gxrvpn59dy8hb1qccb";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";

From 2389a707afb9bd03501a4a9e8fc17b91eb52d962 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 2 Nov 2015 14:50:14 +0100
Subject: [PATCH 085/130] fetch-cargo-deps: add debug output

... so that we can find out why there are sporadic hash mismatches.
---
 pkgs/build-support/rust/fetch-cargo-deps | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 04d33c60d30..b119be273ba 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -172,3 +172,8 @@ done)
 # Remove unneeded outputs
 [[ ! -d $out/registry/src ]] || rm -rf $out/registry/src
 [[ ! -d $out/git/checkouts ]] || rm -rf $out/git/checkouts
+
+# XXX: provide some debugging output to see find out why we are seeing
+# sporadic hash mismatches
+find $out ! -type f
+find $out -type f -exec sha256sum {} +

From 7b5eca1236006ed9ee190fc54dbaadd9dc0de46c Mon Sep 17 00:00:00 2001
From: leenaars <michiel.ml@nlnet.nl>
Date: Mon, 2 Nov 2015 16:04:27 +0100
Subject: [PATCH 086/130] Deleted inappropriate line feed

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 102561e2188..8fb1e45fa2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -182,7 +182,6 @@ let
 
 
   ### Helper functions.
-
   inherit lib config stdenvAdapters;
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;

From 5aad97b90b997de92b3f6b2cdea848e8f9018c5e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 2 Nov 2015 16:33:31 -0200
Subject: [PATCH 087/130] mpv: 0.9.2 -> 0.12.0

---
 pkgs/applications/video/mpv/default.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 5ac70413d16..96f0c2f38f9 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -23,10 +23,6 @@
 , vaapiSupport ? false, libva ? null
 }:
 
-# TODO: Wayland support
-# TODO: investigate caca support
-# TODO: investigate lua5_sockets bug
-
 assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
 assert xineramaSupport -> (libXinerama != null && x11Support);
 assert xvSupport -> (libXv != null && x11Support);
@@ -51,19 +47,21 @@ let
 
   # Purity: Waf is normally downloaded by bootstrap.py, but
   # for purity reasons this behavior should be avoided.
+  wafVersion = "1.8.12";
   waf = fetchurl {
-    url = http://ftp.waf.io/pub/release/waf-1.8.5;
-    sha256 = "0gh266076pd9fzwkycskyd3kkv2kds9613blpxmn9w4glkiwmmh5";
+    urls = [ "http://ftp.waf.io/pub/release/waf-${wafVersion}"
+             "http://waf.io/waf-${wafVersion}" ];
+    sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1";
   };
 in
 
 stdenv.mkDerivation rec {
-  name = "mpv-${version}";
-  version = "0.9.2";
+
+  name = "mpv-${meta.version}";
 
   src = fetchurl {
-    url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "0la7pmy75mq92kcrawdiw5idw6a46z7d15mlkgs0axyivdaqy560";
+    url = "https://github.com/mpv-player/mpv/archive/v${meta.version}.tar.gz";
+    sha256 = "1i3cinyjg1k7rp93cgf641zi8j98hl6qd6al9ws51n29qx22096z";
   };
 
   patchPhase = ''
@@ -127,6 +125,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "0.12.0";
     description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
     homepage = http://mpv.io;
     license = licenses.gpl2Plus;
@@ -140,3 +139,6 @@ stdenv.mkDerivation rec {
     '';
   };
 }
+# TODO: Wayland support
+# TODO: investigate caca support
+# TODO: investigate lua5_sockets bug

From b2d724ed29c89c93abab8c3e2b5f51d0729b9e5a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 2 Nov 2015 19:58:29 +0100
Subject: [PATCH 088/130] calibre: 2.41.0 -> 2.42.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 9d967e839f3..9ebcf170e1b 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "calibre-${version}";
-  version = "2.41.0";
+  version = "2.42.0";
 
   src = fetchurl {
     url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "069fkcsx7kaazs7f095nkz4jw9jrm0k9zq16ayx41lxjbd1r97ik";
+    sha256 = "0inmhkrc6jmpa97wjwai9ny8vmwy9z0fbiw8w43s37ad1w9x5sn1";
   };
 
   inherit python;

From e57217d8742775e9c8f14feb9297418820557ba3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 2 Nov 2015 11:00:32 -0800
Subject: [PATCH 089/130] spl: 0.6.5.2 -> 0.6.5.3

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

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 1089c0e2a09..b8aad109c5a 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -17,13 +17,13 @@ assert buildKernel -> kernel != null;
 stdenv.mkDerivation rec {
   name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
-  version = "0.6.5.2";
+  version = "0.6.5.3";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "09babp00h44iyvmr48w3n20lqjlapw5g6ciw2hhxrpg9nbgcsid7";
+    sha256 = "0lj57apwsy8cfwsvg9z62k71r3qms2p87lgcdk54g7352cwziqps";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];

From f6361bc0966bbe1a34f01f7ae65b1284c75d3038 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 2 Nov 2015 11:00:44 -0800
Subject: [PATCH 090/130] zfs: 0.6.5.2 -> 0.6.5.3

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

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 4a1268cc6b1..28fc35efbd4 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -20,13 +20,13 @@ assert buildKernel -> kernel != null && spl != null;
 stdenv.mkDerivation rec {
   name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
-  version = "0.6.5.2";
+  version = "0.6.5.3";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "zfs";
     rev = "zfs-${version}";
-    sha256 = "0246cypa65rjm8j2123al4x4cwpydqwqrg828pxcpk08v1djy3v1";
+    sha256 = "1hq65kq50hzhd1zqgyzqq2whg1fckigq8jmhhdsnbwrwmx5y76lh";
   };
 
   patches = [ ./nix-build.patch ];

From 4b7f374b7df057faa62e64bcf1534cc7cacca7ab Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 2 Nov 2015 11:01:01 -0800
Subject: [PATCH 091/130] linux: Add 4.3

---
 pkgs/os-specific/linux/kernel/linux-4.3.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 12 +++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.3.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.3.nix b/pkgs/os-specific/linux/kernel/linux-4.3.nix
new file mode 100644
index 00000000000..7248641a5b8
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.3.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.3";
+  modDirVersion = "4.3.0";
+  extraMeta.branch = "4.3";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "1bpkr45i4yzp32p0vpnz8mlv9lk4q2q9awf1kg9khg4a9g42qqja";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2804dc74359..69ffa364f5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9842,6 +9842,15 @@ let
       ];
   };
 
+  linux_4_3 = callPackage ../os-specific/linux/kernel/linux-4.3.nix {
+    kernelPatches = [ kernelPatches.bridge_stp_helper ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
@@ -10002,7 +10011,7 @@ let
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = pkgs.linuxPackages_4_2;
+  linuxPackages_latest = pkgs.linuxPackages_4_3;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -10014,6 +10023,7 @@ let
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
   linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2);
+  linuxPackages_4_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_3 linuxPackages_4_3);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
   linuxPackages_custom = {version, src, configfile}:
                            let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile;

From 261791992c05f6b98175558a71f0c4a1a01c04eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 2 Nov 2015 20:52:08 +0100
Subject: [PATCH 092/130] neovim: fix wrong ad30764d68a

I'm sorry. I had tested that `neovim.src` still built ;-)
Thanks to @codedmart.
---
 pkgs/applications/editors/neovim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 100c48762b5..344293d3367 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -23,7 +23,7 @@ let
 
     src = fetchFromGitHub {
       sha256 = "0i2h74jrx4fy90sv57xj8g4lbjjg4nhrq2rv6rz576fmqfpllcc5";
-      rev = "v${version}";
+      rev = "20ad1396c178c72873aeeb2870bd726f847acb70";
       repo = "libvterm";
       owner = "neovim";
     };
@@ -64,7 +64,7 @@ let
 
     src = fetchFromGitHub {
       sha256 = "1704f3dqf5p6hicpzf0pi21n6ymylra9prsm4azvqp86allmvnfx";
-      rev = "c4826c300340a9e4df20964a14650caf64fc1b58";
+      rev = "v${version}";
       repo = "neovim";
       owner = "neovim";
     };

From c4a825da8b73f3702bd3ddfe43402606423e096d Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 2 Nov 2015 21:22:55 +0100
Subject: [PATCH 093/130] sbcl: 1.2.16 -> 1.3.0

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index e8aabbbcb8a..c464d9856fc 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.16";
+  version = "1.3.0";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "08bg99dhjpvfi3fg4ak6c8kcrfb2ssdsfwwj46nfwniq0jmavacf";
+    sha256 = "1cwrmvbx8m7n7wkcm16yz7qwx221giz7jskzkvy42pj919may36n";
   };
 
   buildInputs = [ which ];

From 248560e593e7700805862be6da808d6fb6306a6d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 2 Nov 2015 20:46:31 +0100
Subject: [PATCH 094/130] nzbget: 16.2 -> 16.3

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

diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index 42eb469bc69..733e12d1e9b 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "nzbget-${version}";
-  version = "16.2";
+  version = "16.3";
 
   src = fetchurl {
     url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${name}-src.tar.gz";
-    sha256 = "19ww3cf1qvivdj2pk676g9gwvfkj5gasvwqnbisx9ihss4bmdx9r";
+    sha256 = "03xzrvgqh90wx183sjrcyn7yilip92g2x5wffnw956ywxb3nsy2g";
   };
 
   buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls

From 7fd0048a934cc0a154319cfc59f099c02305e148 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 2 Nov 2015 21:22:30 +0100
Subject: [PATCH 095/130] bro: 2.4 -> 2.4.1

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

diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 8d6515f2dd2..8d4ae68b0a5 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -2,11 +2,11 @@
 , geoip, gperftools }:
 
 stdenv.mkDerivation rec {
-  name = "bro-2.4";
+  name = "bro-2.4.1";
   
   src = fetchurl {
     url = "http://www.bro.org/downloads/release/${name}.tar.gz";
-    sha256 = "1ch8w8iakr2ajbigaad70b6mfv01s2sbdqgmrqm9q9zc1c5hs33l";
+    sha256 = "1xn8qwgnxihlr4lmg7kz2vqjk46aqgwc8878pbv30ih2lmrrdffq";
   };
   
   buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip

From f4f3df5f5dd5f218a188217b78567adabf399cb8 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 2 Nov 2015 14:33:51 -0800
Subject: [PATCH 096/130] llvm-3.7: add libcxxabi as a buildInput on darwin

---
 pkgs/development/compilers/llvm/3.7/llvm.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index 62245b479f5..863334576ee 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -12,6 +12,7 @@
 , version
 , zlib
 , compiler-rt_src
+, libcxxabi
 , debugVersion ? false
 }:
 
@@ -28,7 +29,8 @@ in stdenv.mkDerivation rec {
     mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
-  buildInputs = [ perl groff cmake libxml2 python libffi ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */;
+  buildInputs = [ perl groff cmake libxml2 python libffi ] /* ++ stdenv.lib.optional stdenv.isLinux valgrind */
+    ++ stdenv.lib.optional stdenv.isDarwin libcxxabi;
 
   propagatedBuildInputs = [ ncurses zlib ];
 

From 135b32f2a0dac04a4ee9ffb6db615206f49c3171 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Mon, 28 Sep 2015 18:32:41 -0700
Subject: [PATCH 097/130] darwin purity: doxygen

---
 pkgs/development/tools/documentation/doxygen/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix                          | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 50f2037b271..78669dfdce7 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, flex, bison, qt4 }:
+{ stdenv, fetchurl, perl, python, flex, bison, qt4, CoreServices, libiconv }:
 
 let
   name = "doxygen-1.8.6";
@@ -11,11 +11,16 @@ stdenv.mkDerivation {
     sha256 = "0pskjlkbj76m9ka7zi66yj8ffjcv821izv3qxqyyphf0y0jqcwba";
   };
 
+  prePatch = ''
+    substituteInPlace configure --replace /usr/bin/install $(type -P install)
+  '';
+
   patches = [ ./tmake.patch ];
 
   buildInputs =
     [ perl python flex bison ]
-    ++ stdenv.lib.optional (qt4 != null) qt4;
+    ++ stdenv.lib.optional (qt4 != null) qt4
+    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
 
   prefixKey = "--prefix ";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28bf9bec193..d7b094980a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5512,6 +5512,7 @@ let
 
   doxygen = callPackage ../development/tools/documentation/doxygen {
     qt4 = null;
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
   doxygen_gui = lowPrio (doxygen.override { inherit qt4; });

From 2bb1263596fe1bc977d0fb8ec044d03c5184a087 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 2 Nov 2015 21:59:07 +0100
Subject: [PATCH 098/130] perl-Any-Moose: 0.24 -> 0.26

---
 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 b706818cfc6..811d9272974 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -158,10 +158,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AnyMoose = buildPerlPackage rec {
-    name = "Any-Moose-0.24";
+    name = "Any-Moose-0.26";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "0g4w11chpnspnksw80jbdn5wp2m5hqzcyjzcy2hsjz9rkk2ncdbk";
+      sha256 = "1wcd1lpx38hvxk6k0zpx48hb7yidxnlr34lyk51zxin9ra9f2104";
     };
     propagatedBuildInputs = [ Mouse ];
   };

From a007e3602a84455d329611e6c408df040adc0b65 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 2 Nov 2015 23:52:56 +0100
Subject: [PATCH 099/130] perl-AuthenSASL: 2.1401 -> 2.16

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 811d9272974..a17e7724f5c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -394,12 +394,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   AuthenSASL = buildPerlPackage rec {
-    name = "Authen-SASL-2.1401";
+    name = "Authen-SASL-2.16";
     src = fetchurl {
       url = "mirror://cpan/authors/id/G/GB/GBARR/${name}.tar.gz";
-      sha256 = "1vx97xnqj5jqlh767l04jbqmsiqd5qcbw2jnbd3qh7fhh0slff6d";
+      sha256 = "02afhlrdq5hh5g8b32fa79fqq5i76qzwfqqvfi9zi57h31szl536";
     };
-    propagatedBuildInputs = [DigestHMAC];
+    propagatedBuildInputs = [ DigestHMAC ];
   };
 
   autobox = pkgs.perlPackages.Autobox;

From cc45f18491799712729aeff79431b4aee5240f5e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 3 Nov 2015 00:32:57 +0100
Subject: [PATCH 100/130] perl-CGI-Simple: 1.113 -> 1.115

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a17e7724f5c..4dba726f231 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1428,11 +1428,11 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ DBFile ];
   };
 
-  CGISimple = buildPerlPackage {
-    name = "CGI-Simple-1.113";
+  CGISimple = buildPerlPackage rec {
+    name = "CGI-Simple-1.115";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AN/ANDYA/CGI-Simple-1.113.tar.gz;
-      sha256 = "0g8v0jd7dk310k6ncz47qa1cfrysi8yib1zwkhasv4zhswgqiqjj";
+      url = "mirror://cpan/authors/id/S/SZ/SZABGAB/${name}.tar.gz";
+      sha256 = "1nkyb1m1g5r47xykflf68dplanih5p15njv82frbgbsms34kp1sg";
     };
     propagatedBuildInputs = [ IOStringy ];
     meta = {

From 635ac2e589396afc2dbd1717b83fa92f03de481b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 3 Nov 2015 00:41:34 +0100
Subject: [PATCH 101/130] perl-Catalyst-Action-REST: 1.17 -> 1.19

---
 pkgs/top-level/perl-packages.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4dba726f231..efbde007d9c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -837,14 +837,15 @@ let self = _self // overrides; _self = with self; {
       [ CatalystRuntime HTTPRequestAsCGI DataVisitor MROCompat ];
   };
 
-  CatalystActionREST = buildPerlPackage {
-    name = "Catalyst-Action-REST-1.17";
+  CatalystActionREST = buildPerlPackage rec {
+    name = "Catalyst-Action-REST-1.19";
     src = fetchurl {
-      url = mirror://cpan/authors/id/F/FR/FREW/Catalyst-Action-REST-1.17.tar.gz;
-      sha256 = "c833c6ba2150b035b0486ff568c1e5928c14bb53d6a70758271feb969aaedde6";
+      url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz";
+      sha256 = "0qiw6b932a73prrg8vw9brpdvjqm37c6wmbliyxvmz0kij6pi2qd";
     };
     buildInputs = [ TestRequires ];
-    propagatedBuildInputs = [ CatalystRuntime ClassInspector LWP MROCompat ModulePluggable Moose ParamsValidate URIFind namespaceautoclean ];
+    propagatedBuildInputs = [ CatalystRuntime ClassInspector LWP MROCompat
+      ModulePluggable Moose ParamsValidate URIFind namespaceautoclean ];
     meta = {
       description = "Automated REST Method Dispatching";
       license = "perl";

From 1650e325412ac5159b18039ecf9c86ba68b341ef Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 3 Nov 2015 01:00:41 +0100
Subject: [PATCH 102/130] perl-Test-Aggregate: init at 0.373

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index efbde007d9c..e9e079c7953 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10625,6 +10625,21 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ LogTrace ];
   };
 
+  TestAggregate = buildPerlPackage rec {
+    name = "Test-Aggregate-0.373";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/${name}.tar.gz";
+      sha256 = "00d218daa7ba29d82bcf364b61d391d3a14356cf3bcb4b12144270108a14fd14";
+    };
+    buildInputs = [ TestMost TestTrap ];
+    propagatedBuildInputs = [ TestNoWarnings ];
+    meta = {
+      description = "Aggregate C<*.t> tests to make them run faster";
+      license = "perl";
+    };
+  };
+
+
   TestBase = buildPerlPackage rec {
     name = "Test-Base-0.88";
     src = fetchurl {

From 79cd29e9fb43374cd5143c2b2255376d4c9e6d99 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 3 Nov 2015 01:01:02 +0100
Subject: [PATCH 103/130] perl-Catalyst-Controller-HTML-FromFo: 0.03007 -> 1.00

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e9e079c7953..41ff8f1e8e1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -903,18 +903,18 @@ let self = _self // overrides; _self = with self; {
   };
 
   CatalystControllerHTMLFormFu = buildPerlPackage rec {
-    name = "Catalyst-Controller-HTML-FormFu-0.03007";
+    name = "Catalyst-Controller-HTML-FormFu-1.00";
     src = fetchurl {
       url = "mirror://cpan/authors/id/C/CF/CFRANKS/${name}.tar.gz";
-      sha256 = "1vrd79d0nbqkana5q483fgsr41idlfgjhf7fpd3hc056z5nq8iyn";
+      sha256 = "0b7if9sz23i4qv0yl0nrv6myfb6db1a1ivm9qp9wdk8nfwl9ncl4";
     };
-    propagatedBuildInputs = [
-      CatalystRuntime CatalystActionRenderView CatalystViewTT
-      CatalystPluginConfigLoader ConfigGeneral
-      CatalystComponentInstancePerContext Moose
-      RegexpAssemble TestWWWMechanize
-      TestWWWMechanizeCatalyst HTMLFormFu
-    ];
+    buildInputs = [ CatalystActionRenderView CatalystPluginSession
+      CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile
+      CatalystViewTT TemplateToolkit TestAggregate TestWWWMechanize
+      TestWWWMechanizeCatalyst ];
+    propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystRuntime
+      ConfigAny HTMLFormFu Moose MooseXAttributeChained RegexpAssemble TaskWeaken
+      namespaceautoclean ];
   };
 
   CatalystDevel = buildPerlPackage {

From 20567e08aef8fac7859b90c3ad9a119bb2618d5c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 3 Nov 2015 01:09:36 +0100
Subject: [PATCH 104/130] perl-Catalyst-DispatchType-Regex: 5.90033 -> 5.90035

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 41ff8f1e8e1..9531b6e279c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -933,11 +933,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CatalystDispatchTypeRegex = buildPerlModule {
-    name = "Catalyst-DispatchType-Regex-5.90033";
+  CatalystDispatchTypeRegex = buildPerlModule rec {
+    name = "Catalyst-DispatchType-Regex-5.90035";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MG/MGRIMES/Catalyst-DispatchType-Regex-5.90033.tar.gz;
-      sha256 = "0rdi8jxj9fz81l9pxl7q190v69vkgxgixcpals555xyiafnqk4vy";
+      url = "mirror://cpan/authors/id/M/MG/MGRIMES/${name}.tar.gz";
+      sha256 = "06jq1lmpq88rmp9zik5gqczg234xac0hiyc3l698iif7zsgcyb80";
     };
     propagatedBuildInputs = [ Moose TextSimpleTable ];
     meta = {

From e15f353714abf45f8076db5917b706ea048630f4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 3 Nov 2015 01:16:45 +0100
Subject: [PATCH 105/130] perl-Catalyst-Manual: 5.9007 -> 5.9009

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9531b6e279c..4df9a63f375 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -970,11 +970,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CatalystManual = buildPerlPackage {
-    name = "Catalyst-Manual-5.9007";
+  CatalystManual = buildPerlPackage rec {
+    name = "Catalyst-Manual-5.9009";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Manual-5.9007.tar.gz;
-      sha256 = "140526pzzqc1vyxkk9fxvp9ds3kk2rncf8nf7iz0adlr219pkg3j";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "1z6l0vdjxzisqgb5w447m3m73sfvkhwm7qw2l1dpcdng3zaypllh";
     };
     meta = {
       description = "The Catalyst developer's manual";

From f490186a6c66ecfc4f200c0bfe999d66fe2105c9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 3 Nov 2015 01:26:34 +0100
Subject: [PATCH 106/130] perl-Catalyst-Plugin-Authentication: 0.10022 ->
 0.10023

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4df9a63f375..77a05b51078 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1028,11 +1028,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CatalystPluginAuthentication = buildPerlPackage {
-    name = "Catalyst-Plugin-Authentication-0.10022";
+  CatalystPluginAuthentication = buildPerlPackage rec {
+    name = "Catalyst-Plugin-Authentication-0.10023";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-0.10022.tar.gz;
-      sha256 = "1yxx89j6q10ydmwwhv3zq68gwndcnh4vvdqiv7az5w2rf2w1nvip";
+      url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz";
+      sha256 = "0v6hb4r1wv3djrnqvnjcn3xx1scgqzx8nyjdg9lfc1ybvamrl0rn";
     };
     buildInputs = [ ClassMOP Moose TestException ];
     propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime ClassInspector Moose MooseXEmulateClassAccessorFast MROCompat namespaceautoclean StringRewritePrefix TryTiny ];

From 8e9a8a8fd037ad99934e1541ea9c92096de6ff3e Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Tue, 3 Nov 2015 09:00:08 +0100
Subject: [PATCH 107/130] gdal: 1.11.2 -> 1.11.3

---
 pkgs/applications/misc/merkaartor/default.nix                 | 4 ++--
 .../libraries/gdal/{gdal-1_11_2.nix => gdal-1_11.nix}         | 4 ++--
 pkgs/development/libraries/openscenegraph/default.nix         | 2 +-
 pkgs/top-level/all-packages.nix                               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/gdal/{gdal-1_11_2.nix => gdal-1_11.nix} (95%)

diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 221b459f84a..a270dca910c 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt4, boost, proj, gdal_1_11_2}:
+{stdenv, fetchurl, qt4, boost, proj, gdal_1_11}:
 
 stdenv.mkDerivation rec {
   name = "merkaartor-0.18.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     qmake -makefile PREFIX=$out
   '';
 
-  buildInputs = [ qt4 boost proj gdal_1_11_2 ];
+  buildInputs = [ qt4 boost proj gdal_1_11 ];
 
   meta = {
     description = "An openstreetmap editor";
diff --git a/pkgs/development/libraries/gdal/gdal-1_11_2.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix
similarity index 95%
rename from pkgs/development/libraries/gdal/gdal-1_11_2.nix
rename to pkgs/development/libraries/gdal/gdal-1_11.nix
index fe7d0869fbd..0e4b4d03541 100644
--- a/pkgs/development/libraries/gdal/gdal-1_11_2.nix
+++ b/pkgs/development/libraries/gdal/gdal-1_11.nix
@@ -3,12 +3,12 @@
 , libpng }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "1.11.2";
+  version = "1.11.3";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845";
+    sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 476f7e14c60..ecb4d82c965 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
-  , coin3d, jasper, gdal_1_11_2, xproto, libX11, libXmu, freeglut, mesa
+  , coin3d, jasper, gdal_1_11, xproto, libX11, libXmu, freeglut, mesa
   , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
   , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
   , qt4, poppler, librsvg, gtk
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7b094980a9..b0b6b2145ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6327,7 +6327,7 @@ let
 
   gdal = callPackage ../development/libraries/gdal { };
 
-  gdal_1_11_2 = callPackage ../development/libraries/gdal/gdal-1_11_2.nix { };
+  gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { };
 
   gdcm = callPackage ../development/libraries/gdcm { };
 

From 7c9be484239bb768753a93419178f8aa4263e6a7 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Tue, 3 Nov 2015 09:04:07 +0100
Subject: [PATCH 108/130] gdal: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 6e1ada69039..8cf84eb08c3 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -3,12 +3,12 @@
 , libpng }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "2.0.0";
+  version = "2.0.1";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6";
+    sha256 = "b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl ]

From 74c99a9600d203de6185c028f62ef48d81393a97 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 3 Nov 2015 02:12:46 -0800
Subject: [PATCH 109/130] remove _main from CoreFoundation

---
 pkgs/os-specific/darwin/apple-source-releases/CF/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
index ed35f8590bf..55c8279340b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
@@ -8,7 +8,6 @@ appleDerivation {
 
   patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ];
 
-  # CFAttributedString.h is in the SDK only, not on opensource.apple.com or github
   __propagatedImpureHostDeps = [
     "/System/Library/Frameworks/CoreFoundation.framework"
     "/usr/lib/libc++.1.dylib"
@@ -30,6 +29,10 @@ appleDerivation {
       --replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \
       --replace 'chmod -RH' 'chmod -R'
 
+    # with this file present, CoreFoundation gets a _main symbol defined, which can
+    # interfere with linking other programs
+    rm plconvert.c
+
     replacement=''$'#define __PTK_FRAMEWORK_COREFOUNDATION_KEY5 55\n#define _pthread_getspecific_direct(key) pthread_getspecific((key))\n#define _pthread_setspecific_direct(key, val) pthread_setspecific((key), (val))'
 
     substituteInPlace CFPlatform.c --replace "#include <pthread/tsd_private.h>" "$replacement"

From 2c6052f8e3b2d84964ead44d22e41e291757a89f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 3 Nov 2015 12:53:59 +0100
Subject: [PATCH 110/130] IDEA Updates

idea.idea-{community,ultimate}: 14.1.5 -> 15.0
idea.pycharm-{community,professional}: 4.5.4 -> 5.0
---
 pkgs/applications/editors/idea/default.nix | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 1148e1ca6cb..25e8dbedd68 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -237,25 +237,25 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "14.1.5";
-    build = "IC-141.2735.5";
+    version = "15.0";
+    build = "IC-143.381";
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "196rijl2k24ysjihdsisfy8hjl21wcn98fn8wagvxsvjf7anyg9k";
+      sha256 = "0d39ipwji76gkc7w5bcl7a94kdz5cwmcnwmvq1lzm06v43jjq51s";
     };
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "14.1.5";
-    build = "IU-141.2735.5";
+    version = "15.0";
+    build = "IU-143.381";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "0wxb7m0k3kbjnr42rwzsk4g09qxqsmnpsdj769azamvsr4p904k9";
+      sha256 = "1hw8hqpzkdlp0ilax6anzjybhmjb40s16jblyplqpah065pc8rja";
     };
   };
 
@@ -273,25 +273,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "4.5.4";
-    build = "141.2569";
+    version = "5.0";
+    build = "143.589";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download-cf.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0a2208rjcvcm9dww317clwiil3ddza3qq9wqkvr0rrcfp1739pbb";
+      sha256 = "01q51m6rpyw296imiglbadzfr0r91wvyrxdid683yl7f5v73wzwh";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "4.5.4";
-    build = "141.2569";
+    version = "5.0";
+    build = "143.589";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download-cf.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1dy64myih92kxmi6h9y142dbmmwwphs2n3vswyg53881g5i0lfhd";
+      sha256 = "16lwg00dl03gwj4dqihdrn15p1fy8513srw2dslna1w1glfajv06";
     };
   };
 

From 137cadb66bbe23459e3e2b051c8d24a9351db1b7 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 3 Nov 2015 04:53:19 -0800
Subject: [PATCH 111/130] darwin purity: flow

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 83ef68ffa54..c049a57e76e 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, libelf }:
+{ stdenv, fetchFromGitHub, ocaml, libelf, cf-private, CoreServices }:
 
 stdenv.mkDerivation rec {
   version = "0.17.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [ ocaml libelf ];
+  buildInputs = [ ocaml libelf cf-private CoreServices ];
 
   meta = with stdenv.lib; {
     homepage = "http://flowtype.org/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7b094980a9..5af665e81ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5537,7 +5537,10 @@ let
 
   findbugs = callPackage ../development/tools/analysis/findbugs { };
 
-  flow = callPackage ../development/tools/analysis/flow { };
+  flow = callPackage ../development/tools/analysis/flow {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+    inherit (darwin) cf-private;
+  };
 
   framac = callPackage ../development/tools/analysis/frama-c { };
 

From bd3099ff6f7a860070202c8b3f3929369caed5a4 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Tue, 3 Nov 2015 14:21:42 +0100
Subject: [PATCH 112/130] openjdk: add infinality patch to improve
 font-rendering

---
 .../openjdk/004_add-fontconfig.patch          |  14 +
 .../openjdk/005_enable-infinality.patch       | 261 ++++++++++++++++++
 pkgs/development/compilers/openjdk/8.nix      |   6 +-
 3 files changed, 280 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/openjdk/004_add-fontconfig.patch
 create mode 100644 pkgs/development/compilers/openjdk/005_enable-infinality.patch

diff --git a/pkgs/development/compilers/openjdk/004_add-fontconfig.patch b/pkgs/development/compilers/openjdk/004_add-fontconfig.patch
new file mode 100644
index 00000000000..8172bc82190
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/004_add-fontconfig.patch
@@ -0,0 +1,14 @@
+This patch was downloaded from https://aur.archlinux.org/cgit/aur.git/tree/?h=java8-openjdk
+More info can be found at http://www.infinality.net/forum/viewtopic.php?f=2&t=275
+diff -ur a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
+--- a/jdk/make/lib/Awt2dLibraries.gmk	2015-07-13 20:50:59.000000000 +0300
++++ b/jdk/make/lib/Awt2dLibraries.gmk	2015-08-24 12:12:22.930330643 +0300
+@@ -824,7 +824,7 @@
+     LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
+         $(call SET_SHARED_LIBRARY_ORIGIN), \
+     LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
+-    LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
++    LDFLAGS_SUFFIX_linux := -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
+     LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
+     LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
+     LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
diff --git a/pkgs/development/compilers/openjdk/005_enable-infinality.patch b/pkgs/development/compilers/openjdk/005_enable-infinality.patch
new file mode 100644
index 00000000000..f8de9698996
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/005_enable-infinality.patch
@@ -0,0 +1,261 @@
+This patch was downloaded from https://aur.archlinux.org/cgit/aur.git/tree/?h=java8-openjdk
+More info can be found at http://www.infinality.net/forum/viewtopic.php?f=2&t=275
+diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native/sun/font/freetypeScaler.c
+--- a/jdk/src/share/native/sun/font/freetypeScaler.c	2014-09-14 16:28:06.108295959 +0200
++++ b/jdk/src/share/native/sun/font/freetypeScaler.c	2014-09-14 16:28:45.569693174 +0200
+@@ -23,6 +23,9 @@
+  * questions.
+  */
+ 
++/* Use Infinality patches as default */
++#define INFINALITY
++
+ #include "jni.h"
+ #include "jni_util.h"
+ #include "jlong.h"
+@@ -38,6 +41,10 @@
+ #include FT_SIZES_H
+ #include FT_OUTLINE_H
+ #include FT_SYNTHESIS_H
++#ifdef INFINALITY
++#include FT_LCD_FILTER_H
++#include <fontconfig/fontconfig.h>
++#endif
+ 
+ #include "fontscaler.h"
+ 
+@@ -676,6 +683,147 @@ static void CopyFTSubpixelVToSubpixel(co
+     }
+ }
+ 
++#ifdef INFINALITY
++typedef struct {
++    FT_Render_Mode ftRenderMode;
++    int ftLoadFlags;
++    FT_LcdFilter ftLcdFilter;
++} RenderingProperties;
++
++static FcPattern* matchedPattern(const FcChar8* family, double ptSize) {
++    /*
++      we will create pattern to find our family and size in
++      fontconfig configuration, and then will return it's
++      properties:
++    */
++    FcPattern* fcPattern = 0;
++    fcPattern = FcPatternCreate();
++    FcValue fcValue;
++    fcValue.type = FcTypeString;
++    fcValue.u.s = family;
++    FcPatternAdd(fcPattern, FC_FAMILY, fcValue, FcTrue);
++    FcPatternAddBool(fcPattern, FC_SCALABLE, FcTrue);
++    FcPatternAddDouble(fcPattern, FC_SIZE, ptSize);
++    // TODO FcPatternAddInteger(pattern, FC_WEIGHT, weight_value);
++    // TODO FcPatternAddInteger(pattern, FC_SLANT, slant_value);
++    // TODO FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size_value);
++    // TODO FcPatternAddInteger(pattern, FC_WIDTH, stretch); 100 in most cases
++    FcConfigSubstitute(0, fcPattern, FcMatchPattern);
++    FcConfigSubstitute(0, fcPattern, FcMatchFont);
++    FcDefaultSubstitute(fcPattern);
++    FcResult res;
++
++    FcPattern *pattern = 0;
++    pattern = FcFontMatch(0, fcPattern, &res);
++    FcPatternDestroy(fcPattern);
++    return pattern;
++}
++
++static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) {
++
++    FcPattern *pattern = matchedPattern(family, ptSize);
++
++    int ftLoadFalgs = FT_LOAD_DEFAULT;
++    FT_Render_Mode ftRenderMode;
++    FT_LcdFilter ftLcdFilter;
++    char horizontal = 1;
++    FcBool b;
++
++    // subpixel order:
++    if (aaType == TEXT_AA_ON)
++        ftRenderMode = FT_RENDER_MODE_NORMAL;
++    else if (aaType == TEXT_AA_OFF)
++        ftRenderMode = FT_RENDER_MODE_MONO;
++    else if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &b) == FcResultMatch)
++        if (b) {
++            int subpixel = FC_RGBA_UNKNOWN;
++            FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel);
++            if (subpixel == FC_RGBA_UNKNOWN)
++                subpixel = FC_RGBA_NONE;
++                switch (subpixel) {
++                case FC_RGBA_NONE:
++                    ftRenderMode = FT_RENDER_MODE_NORMAL;
++                    break;
++                case FC_RGBA_RGB:
++                case FC_RGBA_BGR:
++                    ftRenderMode = FT_RENDER_MODE_LCD;
++                    horizontal = 1;
++                    break;
++                case FC_RGBA_VRGB:
++                case FC_RGBA_VBGR:
++                    ftRenderMode = FT_RENDER_MODE_LCD_V;
++                    horizontal = 0;
++                    break;
++                default:
++                    break;
++                }
++            } else {
++                ftRenderMode = FT_RENDER_MODE_NORMAL;
++            }
++
++    // loading mode:
++    if (aaType == TEXT_AA_OFF)
++        ftLoadFalgs |= FT_LOAD_TARGET_MONO;
++    else {
++        int hint_style = FC_HINT_NONE;
++        FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &hint_style);
++        switch (hint_style) {
++        case FC_HINT_NONE:
++            ftLoadFalgs |= FT_LOAD_NO_HINTING;
++            break;
++        case FC_HINT_SLIGHT:
++            ftLoadFalgs |= FT_LOAD_TARGET_LIGHT;
++            break;
++        case FC_HINT_MEDIUM:
++            ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
++            break;
++        case FC_HINT_FULL:
++            if (aaType == TEXT_AA_ON)
++                ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
++            else
++                ftLoadFalgs |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V;
++            break;
++        default:
++            // what else to use as default?
++            ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
++            break;
++        }
++    }
++
++    // autohinting:
++    if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &b) == FcResultMatch)
++        if (b)
++            ftLoadFalgs |= FT_LOAD_FORCE_AUTOHINT;
++
++    // LCD filter:
++    int filter = FC_LCD_DEFAULT;
++    FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &filter);
++    switch (filter) {
++    case FC_LCD_NONE:
++        ftLcdFilter = FT_LCD_FILTER_NONE;
++        break;
++    case FC_LCD_DEFAULT:
++        ftLcdFilter = FT_LCD_FILTER_DEFAULT;
++        break;
++    case FC_LCD_LIGHT:
++        ftLcdFilter = FT_LCD_FILTER_LIGHT;
++        break;
++    case FC_LCD_LEGACY:
++        ftLcdFilter = FT_LCD_FILTER_LEGACY;
++        break;
++    default:
++        // new unknown lcd filter type?! will use default one:
++        ftLcdFilter = FT_LCD_FILTER_DEFAULT;
++        break;
++    }
++
++    FcPatternDestroy(pattern);
++
++    rp->ftRenderMode = ftRenderMode;
++    rp->ftLoadFlags = ftLoadFalgs;
++    rp->ftLcdFilter = ftLcdFilter;
++}
++#endif
+ 
+ /*
+  * Class:     sun_font_FreetypeFontScaler
+@@ -691,7 +839,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+     UInt16 width, height;
+     GlyphInfo *glyphInfo;
+     int glyph_index;
++#ifndef INFINALITY
+     int renderFlags = FT_LOAD_RENDER, target;
++#endif
+     FT_GlyphSlot ftglyph;
+ 
+     FTScalerContext* context =
+@@ -709,6 +859,11 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+         return ptr_to_jlong(getNullGlyphImage());
+     }
+ 
++#ifdef INFINALITY
++    RenderingProperties renderingProperties;
++    readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
++                   context->ptsz, context->aaType, &renderingProperties);
++#else
+     /* if algorithmic styling is required then we do not request bitmap */
+     if (context->doBold || context->doItalize) {
+         renderFlags =  FT_LOAD_DEFAULT;
+@@ -731,10 +886,17 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+         target = FT_LOAD_TARGET_LCD_V;
+     }
+     renderFlags |= target;
++#endif
+ 
+     glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
+ 
++#ifdef INFINALITY
++    FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);
++    error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
++#else
+     error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
++#endif
++
+     if (error) {
+         //do not destroy scaler yet.
+         //this can be problem of particular context (e.g. with bad transform)
+@@ -753,9 +915,13 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+ 
+     /* generate bitmap if it is not done yet
+      e.g. if algorithmic styling is performed and style was added to outline */
++#ifdef INFINALITY
++    FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode);
++#else
+     if (ftglyph->format == FT_GLYPH_FORMAT_OUTLINE) {
+         FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
+     }
++#endif
+ 
+     width  = (UInt16) ftglyph->bitmap.width;
+     height = (UInt16) ftglyph->bitmap.rows;
+@@ -969,7 +1135,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+ static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
+         FTScalerContext *context, FTScalerInfo* scalerInfo,
+         jint glyphCode, jfloat xpos, jfloat ypos) {
++#ifndef INFINALITY
+     int renderFlags;
++#endif
+     int glyph_index;
+     FT_Error error;
+     FT_GlyphSlot ftglyph;
+@@ -984,11 +1152,22 @@ static FT_Outline* getFTOutline(JNIEnv*
+         return NULL;
+     }
+ 
++#ifdef INFINALITY
++    RenderingProperties renderingProperties;
++    readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
++                   context->ptsz, context->aaType, &renderingProperties);
++#else
+     renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
++#endif
+ 
+     glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
+ 
++#ifdef INFINALITY
++    error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
++#else
+     error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
++#endif
++
+     if (error) {
+         return NULL;
+     }
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 845aebdc250..5d53ed7f025 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -2,6 +2,7 @@
 , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib
 , setJavaClassPath
 , minimal ? false
+, enableInfinality ? true # font rendering patch
 }:
 
 let
@@ -80,7 +81,10 @@ let
       ./fix-java-home-jdk8.patch
       ./read-truststore-from-env-jdk8.patch
       ./currency-date-range-jdk8.patch
-    ];
+    ] ++ (if enableInfinality then [
+      ./004_add-fontconfig.patch
+      ./005_enable-infinality.patch
+    ] else []);
 
     preConfigure = ''
       chmod +x configure

From a487b3326b3eb31c6fbd38ddd394932031ad000e Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 3 Nov 2015 15:24:32 +0100
Subject: [PATCH 113/130] Update HOL Light to version 2015-11-02

---
 .../science/logic/hol_light/default.nix          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 8311ac46654..26ed355da39 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, writeScript, ocaml, camlp5 }:
+{ stdenv, fetchFromGitHub, writeScript, ocaml, camlp5 }:
 
 let
   start_script = ''
@@ -8,14 +8,14 @@ let
   '';
 in
 
-stdenv.mkDerivation rec {
-  name     = "hol_light-${version}";
-  version  = "244";
+stdenv.mkDerivation {
+  name     = "hol_light-2015-11-02";
 
-  src = fetchsvn {
-    url = http://hol-light.googlecode.com/svn/trunk;
-    rev = version;
-    sha256 = "1qzb48j7zbx7c327ixmvq2k0ap7y6fqvwal0195chfxvhs858lfq";
+  src = fetchFromGitHub {
+    owner  = "jrh13";
+    repo   = "hol-light";
+    rev    = "10265313397476ddff4ce13e7bbb588025e7272c";
+    sha256 = "17b6a7vk9fhppl0h366y7pw6a9sknq1a8gxqg67dzqpb47vda1n0";
   };
 
   buildInputs = [ ocaml camlp5 ];

From 27f41d8c0afd2e1380bbab4eea45a16f9345f90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 8 Oct 2015 22:15:15 +0200
Subject: [PATCH 114/130] nixos: add services.jenkins.jobBuilder option

This option allows to define (declarative) Jenkins jobs, using Jenkins
Job Builder (JJB) as backend.

Example:

  services.jenkins = {
    enable = true;
    jobBuilder = {
      enable = true;
      yamlJobs = ''
        - job:
            name: jenkins-job-test
            builders:
              - shell: echo 'Hello world!'
      '';
    };
  };

Jobs can be defined using YAML, JSON and Nix.

Note that it really is declarative configuration; if you remove a
previously defined job, the module will remove the jobdir under
$JENKINS_HOME.

Jobs managed through the Jenkins WebUI (or by other means) are not
touched by this module.

Changes v1 -> v2:
* add nixJobs
* let jsonJobs take a list of strings (allows merge)
* 4 space indent in shell code
---
 nixos/modules/module-list.nix                 |   1 +
 .../jenkins/job-builder.nix                   | 155 ++++++++++++++++++
 2 files changed, 156 insertions(+)
 create mode 100644 nixos/modules/services/continuous-integration/jenkins/job-builder.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9fcb01beaf0..ce9353d58b3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -118,6 +118,7 @@
   ./services/computing/slurm/slurm.nix
   ./services/continuous-integration/jenkins/default.nix
   ./services/continuous-integration/jenkins/slave.nix
+  ./services/continuous-integration/jenkins/job-builder.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
   ./services/databases/couchdb.nix
diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
new file mode 100644
index 00000000000..ec15a6a3d70
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -0,0 +1,155 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  jenkinsCfg = config.services.jenkins;
+  cfg = config.services.jenkins.jobBuilder;
+
+in {
+  options = {
+    services.jenkins.jobBuilder = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether or not to enable the Jenkins Job Builder (JJB) service. It
+          allows defining jobs for Jenkins in a declarative manner.
+
+          Jobs managed through the Jenkins WebUI (or by other means) are left
+          unchanged.
+
+          Note that it really is declarative configuration; if you remove a
+          previously defined job, the corresponding job directory will be
+          deleted.
+
+          Please see the Jenkins Job Builder documentation for more info:
+          <link xlink:href="http://docs.openstack.org/infra/jenkins-job-builder/">
+          http://docs.openstack.org/infra/jenkins-job-builder/</link>
+        '';
+      };
+
+      yamlJobs = mkOption {
+        default = "";
+        type = types.lines;
+        example = ''
+          - job:
+              name: jenkins-job-test-1
+              builders:
+                - shell: echo 'Hello world!'
+        '';
+        description = ''
+          Job descriptions for Jenkins Job Builder in YAML format.
+        '';
+      };
+
+      jsonJobs = mkOption {
+        default = [ ];
+        type = types.listOf types.str;
+        example = literalExample ''
+          [
+            '''
+              [ { "job":
+                  { "name": "jenkins-job-test-2",
+                    "builders": [ "shell": "echo 'Hello world!'" ]
+                  }
+                }
+              ]
+            '''
+          ]
+        '';
+        description = ''
+          Job descriptions for Jenkins Job Builder in JSON format.
+        '';
+      };
+
+      nixJobs = mkOption {
+        default = [ ];
+        type = types.listOf types.attrs;
+        example = literalExample ''
+          [ { job =
+              { name = "jenkins-job-test-3";
+                builders = [
+                  { shell = "echo 'Hello world!'"; }
+                ];
+              };
+            }
+          ];
+        '';
+        description = ''
+          Job descriptions for Jenkins Job Builder in Nix format.
+
+          This is a trivial wrapper around jsonJobs, using builtins.toJSON
+          behind the scene.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (jenkinsCfg.enable && cfg.enable) {
+    systemd.services.jenkins-job-builder = {
+      description = "Jenkins Job Builder Service";
+      # JJB can run either before or after jenkins. We chose after, so we can
+      # always use curl to notify (running) jenkins to reload its config.
+      after = [ "jenkins.service" ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = with pkgs; [ jenkins-job-builder curl ];
+
+      # Q: Why manipulate files directly instead of using "jenkins-jobs upload [...]"?
+      # A: Because this module is for administering a local jenkins install,
+      #    and using local file copy allows us to not worry about
+      #    authentication.
+      script =
+        let
+          yamlJobsFile = builtins.toFile "jobs.yaml" cfg.yamlJobs;
+          jsonJobsFiles =
+            map (x: (builtins.toFile "jobs.json" x))
+              (cfg.jsonJobs ++ [(builtins.toJSON cfg.nixJobs)]);
+          jobBuilderOutputDir = "/run/jenkins-job-builder/output";
+          # Stamp file is placed in $JENKINS_HOME/jobs/$JOB_NAME/ to indicate
+          # ownership. Enables tracking and removal of stale jobs.
+          ownerStamp = ".config-xml-managed-by-nixos-jenkins-job-builder";
+        in
+          ''
+            rm -rf ${jobBuilderOutputDir}
+            cur_decl_jobs=/run/jenkins-job-builder/declarative-jobs
+            rm -f "$cur_decl_jobs"
+
+            # Create / update jobs
+            mkdir -p ${jobBuilderOutputDir}
+            for inputFile in ${yamlJobsFile} ${concatStringsSep " " jsonJobsFiles}; do
+                HOME="${jenkinsCfg.home}" "${pkgs.jenkins-job-builder}/bin/jenkins-jobs" --ignore-cache test -o "${jobBuilderOutputDir}" "$inputFile"
+            done
+
+            for file in "${jobBuilderOutputDir}/"*; do
+                test -f "$file" || continue
+                jobname="$(basename $file)"
+                jobdir="${jenkinsCfg.home}/jobs/$jobname"
+                echo "Creating / updating job \"$jobname\""
+                mkdir -p "$jobdir"
+                touch "$jobdir/${ownerStamp}"
+                cp "$file" "$jobdir/config.xml"
+                echo "$jobname" >> "$cur_decl_jobs"
+            done
+
+            # Remove stale jobs
+            for file in "${jenkinsCfg.home}"/jobs/*/${ownerStamp}; do
+                test -f "$file" || continue
+                jobdir="$(dirname $file)"
+                jobname="$(basename "$jobdir")"
+                grep --quiet --line-regexp "$jobname" "$cur_decl_jobs" 2>/dev/null && continue
+                echo "Deleting stale job \"$jobname\""
+                rm -rf "$jobdir"
+            done
+
+            echo "Asking Jenkins to reload config"
+            curl --silent -X POST http://localhost:${toString jenkinsCfg.port}/reload
+          '';
+      serviceConfig = {
+        User = jenkinsCfg.user;
+        RuntimeDirectory = "jenkins-job-builder";
+      };
+    };
+  };
+}

From 84afac6b899ff6eff176b5576cd7867e15082d84 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 3 Nov 2015 19:45:05 +0100
Subject: [PATCH 115/130] cargo: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index 6d16cbf7405..c614e8c2386 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
 , cmake, zlib }:
 
-with ((import ./common.nix) { inherit stdenv; version = "0.5.0"; });
+with ((import ./common.nix) { inherit stdenv; version = "0.6.0"; });
 
 with rustPlatform;
 
@@ -12,10 +12,10 @@ buildRustPackage rec {
   src = fetchgit {
     url = "git://github.com/rust-lang/cargo";
     rev = "refs/tags/${version}";
-    sha256 = "1wg7vr6fpk9n76ly65lf2z9w1dj5nhykffbwrv46lybd8m3r8x3w";
+    sha256 = "1kxri32sz9ygnf4wlbj7hc7q9p6hmm5xrb9zzkx23wzkzbcpyjyz";
   };
 
-  depsSha256 = "1q92q63g9pz7fy9fhx8y0kqarsshmzv1dq18ki3hdd7d5pcbczna";
+  depsSha256 = "1m045yywv67sx75idbsny59d3dzbqnhr07k41jial5n5zwp87mb9";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib ];
 

From c04c9b69d7ab88f24e6de2169dee52e3975c8da9 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 3 Nov 2015 21:38:15 +0100
Subject: [PATCH 116/130] goPackages.go-bindata: 3.0.7 -> 2015-10-23

---
 pkgs/top-level/go-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 664daef1a4b..1ff61a6041a 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1070,14 +1070,16 @@ let
   };
 
   go-bindata = buildGoPackage rec {
-    version = "3.0.7";
+    rev = "a0ff2567cfb70903282db057e799fd826784d41d";
+    date = "2015-10-23";
+    version = "${date}-${stdenv.lib.strings.substring 0 7 rev}";
     name = "go-bindata-${version}";
     goPackagePath = "github.com/jteeuwen/go-bindata";
     src = fetchFromGitHub {
+      inherit rev;
       repo = "go-bindata";
       owner = "jteeuwen";
-      rev = "v${version}";
-      sha256 = "1v8xwwlv6my5ixvis31m3vgz4sdc0cq82855j8gxmjp1scinv432";
+      sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v";
     };
 
     subPackages = [ "./" "go-bindata" ]; # don't build testdata

From f73c3098d4fb8f3b30312f2aea8b407ad2c03699 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Tue, 3 Nov 2015 17:32:38 -0400
Subject: [PATCH 117/130] vnstat: fix platforms list

---
 pkgs/applications/networking/vnstat/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index 3d0f408659f..b2cba633db8 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     description = "Console-based network statistics utility for Linux";
     maintainers = with maintainers; [ nckx ];
+    platforms = platforms.linux;
   };
 }

From 58b862b750dbfe00bc3e935f5ac8857b2fd6a591 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 3 Nov 2015 13:59:39 -0800
Subject: [PATCH 118/130] darwin purity: pythonPackages.pandas

---
 pkgs/development/interpreters/python/2.7/default.nix | 8 +++-----
 pkgs/top-level/python-packages.nix                   | 8 ++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 6f951bc2837..e08fde3c8bf 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -68,6 +68,8 @@ let
       done
     '' + optionalString stdenv.isDarwin ''
       substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
+      substituteInPlace Lib/multiprocessing/__init__.py \
+        --replace 'os.popen(comm)' 'os.popen("nproc")'
     '';
 
   configureFlags = [
@@ -95,11 +97,7 @@ let
         ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]
     )
     ++ optional zlibSupport zlib
-
-    # depend on CF and configd only if purity is an issue
-    # the impure bootstrap compiler can't build CoreFoundation currently. it requires
-    # <mach-o/dyld.h> which is in our pure bootstrapTools, but not in the system headers.
-    ++ optionals (stdenv.isDarwin && !stdenv.cc.nativeLibc) [ CF configd ];
+    ++ optionals stdenv.isDarwin [ CF configd ];
 
   # Build the basic Python interpreter without modules that have
   # external dependencies.
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed71333eb3d..f6ad5d2a897 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5677,6 +5677,9 @@ let
 
     propagatedBuildInputs = with self; [ argh pathtools pyyaml ];
 
+    buildInputs = stdenv.lib.optionals stdenv.isDarwin
+      [ pkgs.darwin.apple_sdk.frameworks.CoreServices pkgs.darwin.cf-private ];
+
     doCheck = false;
 
     src = pkgs.fetchurl {
@@ -11836,6 +11839,11 @@ let
       substituteInPlace setup.py \
         --replace "['pandas/src/klib', 'pandas/src']" \
                   "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
+
+      # disable clipboard tests since pbcopy/pbpaste are not open source
+      substituteInPlace pandas/io/tests/test_clipboard.py \
+        --replace pandas.util.clipboard no_such_module \
+        --replace OSError ImportError
     '';
 
     # The flag `-A 'not network'` will disable tests that use internet.

From 772960bcb7c7b49661f355e36c83962444c2d0c8 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 3 Nov 2015 14:32:08 -0800
Subject: [PATCH 119/130] darwin purity: mosh

---
 pkgs/tools/networking/mosh/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index ec2f8d78dc6..59ff89547f2 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty
-, makeWrapper, perl, openssl }:
+, makeWrapper, perl, openssl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "mosh-1.2.5";
@@ -9,10 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s";
   };
 
-  buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
+  buildInputs = [
+    boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl
+  ] ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    # look for forkpty in libSystem, not libutil
+    substituteInPlace configure.ac \
+      --replace '[util]' '[System]' \
+      --replace 'LIBUTIL="-lutil"' 'LIBUTIL="-lSystem"'
+  '';
 
   postInstall = ''
-      wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
+    wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
   '';
 
   meta = {

From 88578dad2ec6f8fa89cccd36c5141d3c5a7415bd Mon Sep 17 00:00:00 2001
From: Anne Jan Brouwer <brouwer@annejan.com>
Date: Wed, 4 Nov 2015 01:39:23 +0100
Subject: [PATCH 120/130] Update default.nix

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

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 3d5c93c61a6..39cd5530bf4 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchurl {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "a61a29ddd5a874fcdcb915dbc9d91e10787be22d794cc8ebb2ba3cff27030c67";
+    sha256 = "c6bcb1792f22c48844b49c5bd05f3bf5c1c2ebad249246797a273383c9f08f8c";
   };
 
   buildInputs = [ git gnupg makeWrapper pass qt5.base ];

From 8fb1ee3c2adea256a55a4f406eb605b4b126ebbd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 4 Nov 2015 03:05:12 +0100
Subject: [PATCH 121/130] geolite-legacy 2015-11-02 -> 2015-11-04

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

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 26b2b6f394a..26270ff1f33 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,23 +8,23 @@ 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-11-02";
+  version = "2015-11-04";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "1w0dh8p0zjbrkzm156wy77im4v0yp9d44gygrc10majnyhzkjlff";
+    "18nwbxy6l153zhd7fi4zdyibnmpcb197p3jlb9cjci852asd465l";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "0bs3p76lwlfbawqn0wj2fnnd52bdmkc35rjkpb7wy6sz6x33p79r";
+    "0dm8qvsx8vpwdv9y4z70jiws9bwmw10vdn5sc8jdms53p4rgr4n4";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "09w7vs13xzji574bykggh8cph992zc4yajvhjh4qrvwrxjmjilw3";
+    "1bq9kg6fsdsjssd3i6phq26n1px9jmljnq60gfsh8yb9s18hymfq";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "0jdgfcy90mk7q25rhb8ymnddkskmp2cmyzmbjr3ij0zvbbpzxl4i";
+    "0anx3kppql6wzkpmkf7k1322g4ragb5hh96apl71n2lmwb33i148";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "1k747llmralv2n2krfc1v9f8vdjc3ih3xsgf6g1y60cr78sl197p";

From 3ea8b080045f7b3ab72e7c7f7755eaa6b273652f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 4 Nov 2015 00:24:03 +0100
Subject: [PATCH 122/130] rustcMaster: 2015-10-27 -> 2015-11-01

---
 pkgs/development/compilers/rustc/head.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 7b59c514610..dc1bda27d97 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,11 +2,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "2015-10-27";
+  shortVersion = "2015-11-01";
   isRelease = false;
-  forceBundledLLVM = false;
-  srcRev = "8ab8581f6921bc7a8e3fa4defffd2814372dcb15";
-  srcSha = "06sg327y95zx7w4jxl6i34j4x2g8mhhvri8gxk4qcfmar4cg8has";
+  forceBundledLLVM = true;
+  srcRev = "1a2eaffb6";
+  srcSha = "17b8zgz8j5dmz489b4zs2q4igc9x2v4isgqg3i5nzhacghxjqfyy";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.

From b21a5013a0dd18b2d52e1cd74872e3ccf28740af Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Tue, 6 Oct 2015 20:31:26 +0200
Subject: [PATCH 123/130] Don't fail if env-vars cannot be written to

env-vars is a debugging aid, see
https://github.com/NixOS/nix/commit/3e5dbb24337d8416cfe46484eb2692811546a9c1
for a rationale for this change.
---
 pkgs/build-support/builder-defs/builder-defs.nix | 2 +-
 pkgs/stdenv/generic/setup.sh                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index 551ed9ea57e..e21b032aacb 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -336,7 +336,7 @@ let inherit (builtins) head tail trace; in
 
         doDump = n: noDepEntry "echo Dump number ${n}; set";
 
-	saveEnv = noDepEntry ''export > $TMP/env-vars'';
+	saveEnv = noDepEntry ''export > "$TMP/env-vars" || true'';
 
 	doDumpBuildInputs = noDepEntry (''
 	  echo "${toString realBuildInputs}"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 57875fa6ada..a01af7db70a 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -450,7 +450,7 @@ substituteAllInPlace() {
 # the environment used for building.
 dumpVars() {
     if [ "$noDumpEnvVars" != 1 ]; then
-        export > "$NIX_BUILD_TOP/env-vars"
+        export > "$NIX_BUILD_TOP/env-vars" || true
     fi
 }
 

From b4bd19762a262327db634bfab543760ce3f64e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 4 Nov 2015 07:30:02 +0100
Subject: [PATCH 124/130] Revert "Don't fail if env-vars cannot be written to"

---
 pkgs/build-support/builder-defs/builder-defs.nix | 2 +-
 pkgs/stdenv/generic/setup.sh                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index e21b032aacb..551ed9ea57e 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -336,7 +336,7 @@ let inherit (builtins) head tail trace; in
 
         doDump = n: noDepEntry "echo Dump number ${n}; set";
 
-	saveEnv = noDepEntry ''export > "$TMP/env-vars" || true'';
+	saveEnv = noDepEntry ''export > $TMP/env-vars'';
 
 	doDumpBuildInputs = noDepEntry (''
 	  echo "${toString realBuildInputs}"
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a01af7db70a..57875fa6ada 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -450,7 +450,7 @@ substituteAllInPlace() {
 # the environment used for building.
 dumpVars() {
     if [ "$noDumpEnvVars" != 1 ]; then
-        export > "$NIX_BUILD_TOP/env-vars" || true
+        export > "$NIX_BUILD_TOP/env-vars"
     fi
 }
 

From d80f4c49b0c8a0f35b6c0bc61517e794d0db0761 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 4 Nov 2015 00:55:55 -0800
Subject: [PATCH 125/130] nspr: 4.10.9 -> 4.10.10

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 55cb75d6b7d..e1b7a01c4cd 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.10.9"; in
+let version = "4.10.10"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881";
+    sha256 = "343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107";
   };
 
   preConfigure = ''

From e8cbf833efb53c5699f1119eabe2207f6ea5a601 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 4 Nov 2015 00:56:14 -0800
Subject: [PATCH 126/130] nss: 3.20 -> 3.20.1

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 27fb7cec81a..47bb5cde228 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.20";
+  version = "3.20.1";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_RTM/src/${name}.tar.gz";
-    sha256 = "5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_20_1_RTM/src/${name}.tar.gz";
+    sha256 = "ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From 0bb3e0b3250b701b645c5b228924334569eee05c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 4 Nov 2015 00:56:34 -0800
Subject: [PATCH 127/130] iproute: 4.2.0 -> 4.3.0

---
 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 287b83b637f..891d39d24dd 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "iproute2-4.2.0";
+  name = "iproute2-4.3.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "0c0gyf46ad3jlalm9a7c9iiwvpcrjr4gylrkyranp8qd7rs1w454";
+    sha256 = "159988vv3fd78bzhisfl1dl4dd7km3vjzs2d8899a0vcvn412fzh";
   };
 
   patches = lib.optionals enableFan [ ./ubuntu-fan.patch ];

From 588a950df976cbd5a0795c0ceabc49ae0986bbd7 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 4 Nov 2015 00:57:17 -0800
Subject: [PATCH 128/130] firefox: Updates   - 41.0.2 -> 42.0   - 38.3.0 ->
 38.4.0

---
 .../networking/browsers/firefox/default.nix    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index c2efc370631..168223f1a7e 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -18,14 +18,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
 let
 
-common = { pname, version, sha1 }: stdenv.mkDerivation rec {
+common = { pname, version, sha256 }: stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url =
       let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2";
       in "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}";
-    inherit sha1;
+    inherit sha256;
   };
 
   buildInputs =
@@ -83,7 +83,11 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec {
     ''
       mkdir ../objdir
       cd ../objdir
-      configureScript=../mozilla-*/configure
+      if [ -e ../${name} ]; then
+        configureScript=../${name}/configure
+      else
+        configureScript=../mozilla-*/configure
+      fi
     '';
 
   preInstall =
@@ -129,14 +133,14 @@ in {
 
   firefox = common {
     pname = "firefox";
-    version = "41.0.2";
-    sha1 = "5e8243cbbd3ea306bd1e5f1b16079bdcc9af95a4";
+    version = "42.0";
+    sha256 = "1bm37p1ydxvnflh7kb52g6wfblxqc0kbgjn09sv7g0i9k5k38jlr";
   };
 
   firefox-esr = common {
     pname = "firefox-esr";
-    version = "38.3.0esr";
-    sha1 = "57d2c255348ac13b6ffbb952c5e0d57757aa0290";
+    version = "38.4.0esr";
+    sha256 = "1izj0zi4dhp3957ya1nlh0mp6gyb7gvmwnlfv6q1cc3bw5y1z2h2";
   };
 
 }

From 6e57f1c60c9bc525c62cda2b0ec1188b982b6924 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 4 Nov 2015 00:57:53 -0800
Subject: [PATCH 129/130] btrfsProgs: 4.2.2 -> 4.2.3

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

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 4c328d70fd6..21589a70f87 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
 
-let version = "4.2.2"; in
+let version = "4.2.3"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "05hkj8fpgc2c9068f167hp8k8h28zadlh7krcz0qi8m3nbmy91sx";
+    sha256 = "0gpknqvnpl4y78fsfak3iv147czc0rak8fbcg0d9krr50wzd3hf3";
   };
 
   buildInputs = [

From 86ba275a99908a30f5139d5e605d0ac1f5d3ea7b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 4 Nov 2015 00:58:07 -0800
Subject: [PATCH 130/130] ceph: 0.94.4 -> 0.94.5

---
 pkgs/tools/filesystems/ceph/0.94.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 301ff940d0c..abaea41b8c5 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.94.4";
+  version = "0.94.5";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0jp3c805bix88z3103kbrxv2yndpjcz3j5rp669f7qq46074zw6g";
+    sha256 = "0xjbs26c06awpsas4ywdqvql7hdx37slk49zmc4k8w87ff4wwxmc";
   };
 
   patches = [ ./fix-pgrefdebugging.patch ];