From 06bcdc177cf4dfe8935a100793d759bab3bc163f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:09:50 +0100
Subject: [PATCH 01/90] postgrey: extended configuration

---
 nixos/modules/services/mail/postgrey.nix | 110 +++++++++++++++++++----
 1 file changed, 95 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 0db631868cc..1c84841f397 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -4,6 +4,39 @@ with lib; let
 
   cfg = config.services.postgrey;
 
+  natural = with types; addCheck int (x: x >= 0);
+  natural' = with types; addCheck int (x: x > 0);
+
+  socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port");
+
+  inetSocket = with types; {
+    addr = mkOption {
+      type = nullOr string;
+      default = null;
+      example = "127.0.0.1";
+      description = "The address to bind to. Localhost if null";
+    };
+    port = mkOption {
+      type = natural';
+      default = 10030;
+      description = "Tcp port to bind to";
+    };
+  };
+
+  unixSocket = with types; {
+    path = mkOption {
+      type = path;
+      default = "/var/run/postgrey.sock";
+      description = "Path of the unix socket";
+    };
+
+    mode = mkOption {
+      type = string;
+      default = "0777";
+      description = "Mode of the unix socket";
+    };
+  };
+
 in {
 
   options = {
@@ -13,21 +46,68 @@ in {
         default = false;
         description = "Whether to run the Postgrey daemon";
       };
-      inetAddr = mkOption {
-        type = nullOr string;
-        default = null;
-        example = "127.0.0.1";
-        description = "The inet address to bind to. If none given, bind to /var/run/postgrey.sock";
-      };
-      inetPort = mkOption {
-        type = int;
-        default = 10030;
-        description = "The tcp port to bind to";
+      socket = mkOption {
+        type = socket;
+        default = { path = "/var/run/postgrey.sock"; };
+        example = {
+          addr = "127.0.0.1";
+          port = 10030;
+        };
+        description = "Socket to bind to";
       };
       greylistText = mkOption {
         type = string;
         default = "Greylisted for %%s seconds";
-        description = "Response status text for greylisted messages";
+        description = "Response status text for greylisted messages; use %%s for seconds left until greylisting is over and %%r for mail domain of recipient";
+      };
+      greylistAction = mkOption {
+        type = string;
+        default = "DEFER_IF_PERMIT";
+        description = "Response status for greylisted messages (see access(5))";
+      };
+      greylistHeader = mkOption {
+        type = string;
+        default = "X-Greylist: delayed %%t seconds by postgrey-%%v at %%h; %%d";
+        description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host";
+      };
+      delay = mkOption {
+        type = natural;
+        default = 300;
+        description = "Greylist for N seconds";
+      };
+      maxAge = mkOption {
+        type = natural;
+        default = 35;
+        description = "Delete entries from whitelist if they haven't been seen for N days";
+      };
+      retryWindow = mkOption {
+        type = either string natural;
+        default = 2;
+        example = "12h";
+        description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours";
+      };
+      lookupBySubnet = mkOption {
+        type = bool;
+        default = true;
+        description = "Strip the last N bits from IP addresses, determined by IPv4CIDR and IPv6CIDR";
+      };
+      IPv4CIDR = mkOption {
+        type = natural;
+        default = 24;
+      };
+      IPv6CIDR = mkOption {
+        type = natural;
+        default = 64;
+      };
+      privacy = mkOption {
+        type = bool;
+        default = true;
+        description = "Store data using one-way hash functions (SHA1)";
+      };
+      autoWhitelist = mkOption {
+        type = nullOr natural';
+        default = 5;
+        description = "Whitelist clients after successful delivery of N messages";
       };
     };
   };
@@ -52,10 +132,10 @@ in {
     };
 
     systemd.services.postgrey = let
-      bind-flag = if isNull cfg.inetAddr then
-        "--unix=/var/run/postgrey.sock"
+      bind-flag = if cfg.socket ? "path" then
+        ''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}''
       else
-        "--inet=${cfg.inetAddr}:${cfg.inetPort}";
+        ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${cfg.socket.port}'';
     in {
       description = "Postfix Greylisting Service";
       wantedBy = [ "multi-user.target" ];
@@ -67,7 +147,7 @@ in {
       '';
       serviceConfig = {
         Type = "simple";
-        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --pidfile=/var/run/postgrey.pid --group=postgrey --user=postgrey --dbdir=/var/postgrey --greylist-text="${cfg.greylistText}"'';
+        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${cfg.delay} --max-age=${cfg.maxAge} --retry-window=${cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${cfg.IPv4CIDR} --ipv6cidr=${cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${if cfg.autoWhitelist == null then "0" else cfg.autoWhitelist} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction}'';
         Restart = "always";
         RestartSec = 5;
         TimeoutSec = 10;

From e196ad2c66c13eefa109259e60e91b20b0eb2d55 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:12:39 +0100
Subject: [PATCH 02/90] postgrey: add descriptions to IPv?CIDR

---
 nixos/modules/services/mail/postgrey.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 1c84841f397..c6fec566c0b 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -94,10 +94,12 @@ in {
       IPv4CIDR = mkOption {
         type = natural;
         default = 24;
+        description = "Strip N bits from IPv4 addresses if lookupBySubnet is true";
       };
       IPv6CIDR = mkOption {
         type = natural;
         default = 64;
+        description = "Strip N bits from IPv6 addresses if lookupBySubnet is true";
       };
       privacy = mkOption {
         type = bool;

From e2dd0799a8cf252d4a8b59006f7b43fa536ee3fb Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:19:00 +0100
Subject: [PATCH 03/90] postgrey: fix submodule syntax

---
 nixos/modules/services/mail/postgrey.nix | 42 +++++++++++++-----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index c6fec566c0b..73f271d2a31 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -10,30 +10,34 @@ with lib; let
   socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port");
 
   inetSocket = with types; {
-    addr = mkOption {
-      type = nullOr string;
-      default = null;
-      example = "127.0.0.1";
-      description = "The address to bind to. Localhost if null";
-    };
-    port = mkOption {
-      type = natural';
-      default = 10030;
-      description = "Tcp port to bind to";
+    options = {
+      addr = mkOption {
+        type = nullOr string;
+        default = null;
+        example = "127.0.0.1";
+        description = "The address to bind to. Localhost if null";
+      };
+      port = mkOption {
+        type = natural';
+        default = 10030;
+        description = "Tcp port to bind to";
+      };
     };
   };
 
   unixSocket = with types; {
-    path = mkOption {
-      type = path;
-      default = "/var/run/postgrey.sock";
-      description = "Path of the unix socket";
-    };
+    options = {
+      path = mkOption {
+        type = path;
+        default = "/var/run/postgrey.sock";
+        description = "Path of the unix socket";
+      };
 
-    mode = mkOption {
-      type = string;
-      default = "0777";
-      description = "Mode of the unix socket";
+      mode = mkOption {
+        type = string;
+        default = "0777";
+        description = "Mode of the unix socket";
+      };
     };
   };
 

From 3c0d02c3877bea0d796ff3617a3f4e828295b56d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:27:00 +0100
Subject: [PATCH 04/90] postgrey: coerce integers

---
 nixos/modules/services/mail/postgrey.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 73f271d2a31..ab0ffe7515d 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -141,7 +141,7 @@ in {
       bind-flag = if cfg.socket ? "path" then
         ''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}''
       else
-        ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${cfg.socket.port}'';
+        ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}'';
     in {
       description = "Postfix Greylisting Service";
       wantedBy = [ "multi-user.target" ];
@@ -153,7 +153,7 @@ in {
       '';
       serviceConfig = {
         Type = "simple";
-        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${cfg.delay} --max-age=${cfg.maxAge} --retry-window=${cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${cfg.IPv4CIDR} --ipv6cidr=${cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${if cfg.autoWhitelist == null then "0" else cfg.autoWhitelist} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction}'';
+        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${toString cfg.delay} --max-age=${toString cfg.maxAge} --retry-window=${toString cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction}'';
         Restart = "always";
         RestartSec = 5;
         TimeoutSec = 10;

From 82291bae49fd9e6aa2b899fb5464747a58051822 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:32:50 +0100
Subject: [PATCH 05/90] postgrey: more verbose default socket

---
 nixos/modules/services/mail/postgrey.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index ab0ffe7515d..7bf1c30fc67 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -52,7 +52,10 @@ in {
       };
       socket = mkOption {
         type = socket;
-        default = { path = "/var/run/postgrey.sock"; };
+        default = {
+          path = "/var/run/postgrey.sock";
+          mode = "0777";
+        };
         example = {
           addr = "127.0.0.1";
           port = 10030;

From 58fa71b39c9e5d0af7b8329a0c3ebf99f305bc71 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:40:54 +0100
Subject: [PATCH 06/90] postgrey: allow additional whitelists

---
 nixos/modules/services/mail/postgrey.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 7bf1c30fc67..7db4e4d1c21 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -118,6 +118,16 @@ in {
         default = 5;
         description = "Whitelist clients after successful delivery of N messages";
       };
+      whitelistClients = mkOption {
+        type = listOf path;
+        default = [];
+        description = "Client address whitelist files (see postgrey(8))";
+      };
+      whitelistRecipients = mkOption {
+        type = listOf path;
+        default = [];
+        description = "Recipient address whitelist files (see postgrey(8))";
+      };
     };
   };
 
@@ -156,7 +166,7 @@ in {
       '';
       serviceConfig = {
         Type = "simple";
-        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${toString cfg.delay} --max-age=${toString cfg.maxAge} --retry-window=${toString cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction}'';
+        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${toString cfg.delay} --max-age=${toString cfg.maxAge} --retry-window=${toString cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction} ${concatMapStringsSep " " (x: "--whitelist-clients=" + x) cfg.whitelistClients} ${concatMapStringsSep " " (x: "--whitelist-recipients=" + x) cfg.whitelistRecipients}'';
         Restart = "always";
         RestartSec = 5;
         TimeoutSec = 10;

From 65f0ddbd534c1bd74d7fdbd8db3dff0d00a89c5a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 15:42:51 +0100
Subject: [PATCH 07/90] postgrey: improve formatting

---
 nixos/modules/services/mail/postgrey.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 7db4e4d1c21..d4ae25c066a 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -166,7 +166,23 @@ in {
       '';
       serviceConfig = {
         Type = "simple";
-        ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --group=postgrey --user=postgrey --dbdir=/var/postgrey --delay=${toString cfg.delay} --max-age=${toString cfg.maxAge} --retry-window=${toString cfg.retryWindow} ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} ${optionalString cfg.privacy "--privacy"} --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} --greylist-text="${cfg.greylistText}" --x-greylist-header="${cfg.greylistHeader}" --greylist-action=${cfg.greylistAction} ${concatMapStringsSep " " (x: "--whitelist-clients=" + x) cfg.whitelistClients} ${concatMapStringsSep " " (x: "--whitelist-recipients=" + x) cfg.whitelistRecipients}'';
+        ExecStart = ''${pkgs.postgrey}/bin/postgrey \
+          ${bind-flag} \
+          --group=postgrey --user=postgrey \
+          --dbdir=/var/postgrey \
+          --delay=${toString cfg.delay} \
+          --max-age=${toString cfg.maxAge} \
+          --retry-window=${toString cfg.retryWindow} \
+          ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} \
+          --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} \
+          ${optionalString cfg.privacy "--privacy"} \
+          --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} \
+          --greylist-action=${cfg.greylistAction} \
+          --greylist-text="${cfg.greylistText}" \
+          --x-greylist-header="${cfg.greylistHeader}" \
+          ${concatMapStringsSep " " (x: "--whitelist-clients=" + x) cfg.whitelistClients} \
+          ${concatMapStringsSep " " (x: "--whitelist-recipients=" + x) cfg.whitelistRecipients}
+        '';
         Restart = "always";
         RestartSec = 5;
         TimeoutSec = 10;

From 9383b2cf347c4181bbdd14b5c8bcb929e4cdcb8b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Mon, 2 Jan 2017 18:01:42 +0100
Subject: [PATCH 08/90] postgrey: backwards compatability

---
 nixos/modules/rename.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 8102e0e1f64..758f229d59d 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -153,6 +153,17 @@ with lib;
     # alsa
     (mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ])
 
+    # postgrey
+    (mkMergedOptionModule [ [ "services" "postgrey" "inetAddr" ] [ "services" "postgrey" "inetPort" ] ] [ "services" "postgrey" "socket" ] (config: let
+        value = p: getAttrFromPath p config;
+        inetAddr = [ "services" "postgrey" "inetAddr" ];
+        inetPort = [ "services" "postgrey" "inetPort" ];
+      in
+        if value inetAddr == null
+        then { path = "/var/run/postgrey.sock"; }
+        else { addr = value inetAddr; port = value inetPort; }
+    ))
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
     (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

From 95af71e4eff3522d2d838958b5a19c94e0600c22 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 17 Dec 2016 16:14:41 +0100
Subject: [PATCH 09/90] pythonPackages.parsedatetime: 1.5 -> 2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0141729e30..ab7aaed729c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17989,11 +17989,19 @@ in {
 
   parsedatetime = buildPythonPackage rec {
     name = "parsedatetime-${version}";
-    version = "1.5";
+    version = "2.1";
+
+    meta = {
+      description = "Parse human-readable date/time text";
+      homepage = "https://github.com/bear/parsedatetime";
+      license = licenses.asl20;
+    };
+
+    buildInputs = with self; [ PyICU nose ];
 
     src = pkgs.fetchurl {
         url = "mirror://pypi/p/parsedatetime/${name}.tar.gz";
-        sha256 = "1as0mm4ql3z0324nc9bys2s1ngh507i317p16b79rx86wlmvx9ix";
+        sha256 = "0bdgyw6y3v7bcxlx0p50s8drxsh5bb5cy2afccqr3j90amvpii8p";
     };
   };
 

From d43479badbca6c3df82b0f52905275f3c0da7b47 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:23:41 +0100
Subject: [PATCH 10/90] mdp: 1.0.7 -> 1.0.9

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

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index a44f4bff83e..5206feb215c 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.7";
+  version = "1.0.9";
   name = "mdp-${version}";
 
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
     rev = version;
-    sha256 = "10jkv8g04vvhik42y0qqcbn05hlnfsgbljhx69hx1sfn7js2d8g4";
+    sha256 = "183flp52zfady4f8f3vgapr5f5k6cvanmj2hw293v6pw71qnafmd";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 95d64801995e9e1806d1dff3cc8283698df7912f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:29:43 +0100
Subject: [PATCH 11/90] haxor-news: 0.3.1 -> 0.4.1

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

diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index e4074547d78..e925885f05f 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.3.1";
+  version = "0.4.1";
   name = "haxor-news-${version}";
 
   src = fetchurl {
-    url = "https://github.com/donnemartin/haxor-news/archive/0.3.1.tar.gz";
-    sha256 = "0jglx8fy38sjyszvvg7mvmyk66l53kyq4i09hmgdz7hb1hrm9m2m";
+    url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";
+    sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 9680f12fbe8db49d34deaf5cfdeeb69b368b5214 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:31:55 +0100
Subject: [PATCH 12/90] cortex: 2014-08-01 -> 2015-08-23

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

diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix
index 777a759177c..42565ae7fa8 100644
--- a/pkgs/applications/misc/cortex/default.nix
+++ b/pkgs/applications/misc/cortex/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, python3 }:
 
 stdenv.mkDerivation {
-  name = "cortex-2014-08-01";
+  name = "cortex-2015-08-23";
 
   src = fetchgit {
     url = "https://github.com/gglucas/cortex";
-    rev = "e749de6c21aae02386f006fd0401d22b9dcca424";
-    sha256 = "d5d59c5257107344122c701eb370f3740f9957b6b898ac798d797a4f152f614c";
+    rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639";
+    sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg";
   };
 
   buildInputs = [ stdenv python3 ];

From eb07e355549e9851d810b03ff2237a2a3ca4cf07 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:33:03 +0100
Subject: [PATCH 13/90] pipes: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix
index 8ff4a1074e6..9393a978b07 100644
--- a/pkgs/misc/screensavers/pipes/default.nix
+++ b/pkgs/misc/screensavers/pipes/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pipes-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz";
-    sha256 = "1225llbm0zfnkqykfi7qz7z5p102pwldmj22761m653jy0ahi7w2";
+    sha256 = "1v0xhgq30zkfjk9l5g8swpivh7rxfjbzhbjpr2c5c836wgn026fb";
   };
 
   buildInputs = with pkgs; [ bash ];

From be4caf3ef75158aadf85dfe2ac4fb3d498ee5c7f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:34:23 +0100
Subject: [PATCH 14/90] sc-im: 0.2.1 -> 0.4.0

---
 pkgs/applications/misc/sc-im/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index cb18278d1ed..75d08ec8188 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }:
+{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, pkgconfig }:
 
-let
-  version = "0.2.1";
-in
 stdenv.mkDerivation rec {
-
+  version = "0.4.0";
   name = "sc-im-${version}";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
     rev = "v${version}";
-    sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb";
+    sha256 = "1v1cfmfqs5997bqlirp6p7smc3qrinq8dvsi33sk09r33zkzyar0";
   };
 
-  buildInputs = [ yacc ncurses libxml2 ];
+  buildInputs = [ yacc ncurses libxml2 pkgconfig ];
 
   buildPhase = ''
     cd src
 
-    sed "s,prefix=/usr,prefix=$out," Makefile
-    sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile
+    sed -i "s,prefix=/usr,prefix=$out," Makefile
+    sed -i "s,-I/usr/include/libxml2,-I$libxml2," Makefile
 
     make
     export DESTDIR=$out

From 8c2e6df52d8006c457764bc076ee216399f96f34 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:37:17 +0100
Subject: [PATCH 15/90] cli-visualizer: 2016-06-02 -> 1.5

---
 pkgs/applications/misc/cli-visualizer/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 1c7fd62f8ec..cdde212275d 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, fftw, ncurses, libpulseaudio }:
+{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  version = "2016-06-02";
+  version = "1.5";
   name = "cli-visualizer-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/dpayne/cli-visualizer.git";
-    rev = "bc0104eb57e7a0b3821510bc8f93cf5d1154fa8e";
-    sha256 = "16768gyi85mkizfn874q2q9xf32knw08z27si3k5bk99492dxwzw";
+  src = fetchFromGitHub {
+    owner = "dpayne";
+    repo = "cli-visualizer";
+    rev = version;
+    sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs";
   };
 
   postPatch = ''

From 71c247b3ad27f982312de7f858ffc31ec8593e26 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 4 Jan 2017 16:25:59 +0100
Subject: [PATCH 16/90] mailcap-fix: init at 1.0.1

---
 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 a0141729e30..85226883193 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30047,6 +30047,24 @@ EOF
     };
   };
 
+  mailcap-fix = buildPythonPackage rec {
+    name = "mailcap-fix-${version}";
+    version = "1.0.1";
+
+    disabled = isPy36; # this fix is merged into python 3.6
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/m/mailcap-fix/${name}.tar.gz";
+      sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A patched mailcap module that conforms to RFC 1524";
+      homepage = "https://github.com/michael-lazar/mailcap_fix";
+      license = licenses.unlicense;
+    };
+  };
+
   maildir-deduplicate = buildPythonPackage rec {
     name = "maildir-deduplicate-${version}";
     version = "1.0.2";

From a52ac0a5c6f5a1eba62a1bc01d92f7bcf672089c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:38:45 +0100
Subject: [PATCH 17/90] rtv: 1.10.0 -> 1.13.0

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

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 8488a8e6842..e2af415e60a 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.10.0";
+  version = "1.13.0";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "1gm5jyqqssf69lfx0svhzsb9m0dffm6zsf9jqnwh6gjihfz25a45";
+    sha256 = "0rxncbzb4a7zlfxmnn5jm6yvwviaaj0v220vwv82hkjiwcdjj8jf";
   };
 
   propagatedBuildInputs = with pythonPackages; [
+    beautifulsoup4
+    mailcap-fix
     tornado
     requests2
     six

From 6587d6bf1d9bcbbcbc5c27ac2082ff8980b55392 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:39:33 +0100
Subject: [PATCH 18/90] buku: 2.5 -> 2.7

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

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 85d3c4e49f9..a0414786ba4 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -2,14 +2,14 @@
 }:
 
 with pythonPackages; buildPythonApplication rec {
-  version = "2.5";
+  version = "2.7";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "0m6km37zylinsblwm2p8pm760xlsf9m82xyws3762xs8zxbnfmsd";
+    sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk";
   };
 
   buildInputs = [

From 91a248009c1f76b8569368476cfe5f1318342425 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:40:48 +0100
Subject: [PATCH 19/90] gotty: 0.0.10 -> 0.0.13

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

diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index 28ca858440b..ccab31ce225 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gotty-${version}";
-  version = "0.0.10";
+  version = "0.0.13";
   rev = "v${version}";
 
   goPackagePath = "github.com/yudai/gotty";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "yudai";
     repo = "gotty";
-    sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09";
+    sha256 = "1hsfjyjjzr1zc9m8bnhid1ag6ipcbx59111y9p7k8az8jiyr112g";
   };
 
   goDeps = ./deps.nix;

From b5c7ce015f61547721c8bbf6e03a4a5944fcfe76 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:41:51 +0100
Subject: [PATCH 20/90] http-prompt: 0.2.0 -> 0.8.0

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

diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index ba9b8b2d771..55ba6b9db55 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pythonPackages, httpie }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.2.0";
+  version = "0.8.0";
   name = "http-prompt";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     repo = "http-prompt";
     owner = "eliangcs";
-    sha256 = "0hgw3kx9rfdg394darms3vqcjm6xw6qrm8gnz54nahmyxnhrxnpp";
+    sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 52d95487dd389edf88a260a8a2cfa14ff45de5c0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 12:44:52 +0100
Subject: [PATCH 21/90] fava: Fix github source (owner)

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

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 5ed7d25667e..76c4b047cea 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec {
   name = "fava-${version}";
 
   src = fetchFromGitHub {
-    owner = "aumayr";
+    owner = "beancount";
     repo = "fava";
     rev = "v${version}";
     sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka";

From cc0a5d589ddf1f6a4fb72a5b4daed8852b65e34a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:43:04 +0100
Subject: [PATCH 22/90] fava: 1.0 -> 1.2

---
 pkgs/applications/office/fava/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 76c4b047cea..a246c7290a5 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -1,19 +1,17 @@
 { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.0";
+  version = "1.2";
   name = "fava-${version}";
 
-  src = fetchFromGitHub {
-    owner = "beancount";
-    repo = "fava";
-    rev = "v${version}";
-    sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka";
+  src = fetchurl {
+    url = "https://github.com/beancount/fava/archive/v${version}.tar.gz";
+    sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw";
   };
 
   assets = fetchzip {
-    url = "https://github.com/aumayr/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
-    sha256 = "1vvidwfn5882dslz6qqkkd84m7w52kd34x10qph8yhipyjv1dimc";
+    url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
+    sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp";
   };
 
   buildInputs = with python3Packages; [ pytest_30 ];

From b1f4c1dffe7090014ebfcda76a6b78f655e5f7ed Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:46:06 +0100
Subject: [PATCH 23/90] beancount: 2.0b12 -> 2.0b13

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

diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix
index 2034c832294..72f6c5de8a1 100644
--- a/pkgs/applications/office/beancount/default.nix
+++ b/pkgs/applications/office/beancount/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchhg, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "2.0b12";
+  version = "2.0b13";
   name = "beancount-${version}";
   namePrefix = "";
 
   src = pkgs.fetchurl {
     url = "mirror://pypi/b/beancount/${name}.tar.gz";
-    sha256 = "0n0wyi2yhmf8l46l5z68psk4rrzqkgqaqn93l0wnxsmp1nmqly9z";
+    sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm";
   };
 
   buildInputs = with pythonPackages; [ nose ];

From d359101891708c3ce3ffaa645c30666fa7d0b521 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:47:13 +0100
Subject: [PATCH 24/90] bean-add: 2016-10-03 -> 2016-12-02

---
 pkgs/applications/office/beancount/bean-add.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix
index 3afb7ce4b10..4e73a305ea4 100644
--- a/pkgs/applications/office/beancount/bean-add.nix
+++ b/pkgs/applications/office/beancount/bean-add.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 stdenv.mkDerivation rec {
-  name = "bean-add-2016-10-03";
+  name = "bean-add-2016-12-02";
 
   src = fetchFromGitHub {
     owner = "simon-v";
     repo = "bean-add";
-    rev = "41deacc09b992db5eede34fefbfb2c0faeba1652";
-    sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca";
+    rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9";
+    sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09";
   };
 
   propagatedBuildInputs = with python3Packages; [ python ];

From a3d42f3999da04246d4d25bcc2dd16df53847c93 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Jan 2017 14:49:29 +0100
Subject: [PATCH 25/90] weather: 2.0 -> 2.3

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

diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index 192e4406b6d..a184d31233c 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-    version = "2.0";
+    version = "2.3";
     name = "weather-${version}";
 
     src = fetchurl {
         url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz";
-        sha256 = "0yil363y9iyr4mkd7xxq0p2260wh50f9i5p0map83k9i5l0gyyl0";
+        sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546";
     };
 
     nativeBuildInputs = [ pythonPackages.wrapPython ];

From 9e97c0b937b8ce73f11da3a6bfa7f8317b863af6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 4 Jan 2017 16:24:56 +0000
Subject: [PATCH 26/90] packer: 0.10.1 -> 0.12.1

---
 pkgs/development/tools/packer/default.nix |  51 +-
 pkgs/development/tools/packer/deps.nix    | 560 ----------------------
 pkgs/top-level/all-packages.nix           |  12 +-
 3 files changed, 12 insertions(+), 611 deletions(-)
 delete mode 100644 pkgs/development/tools/packer/deps.nix

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 7e8e2092ceb..d7e6bbd0351 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,47 +1,18 @@
-{ stdenv, lib, gox, gotools, buildGoPackage, fetchFromGitHub
-, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-stdenv.mkDerivation rec {
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+buildGoPackage rec {
   name = "packer-${version}";
-  version = "0.10.1";
+  version = "0.12.1";
 
-  src = (import ./deps.nix {
-    inherit stdenv lib gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn;
-  }).out;
+  goPackagePath = "github.com/mitchellh/packer";
 
-  buildInputs = [ src.go gox gotools ];
+  subPackages = [ "." ];
 
-  configurePhase = ''
-    export GOPATH=$PWD/share/go
-    export XC_ARCH=$(go env GOARCH)
-    export XC_OS=$(go env GOOS)
-
-    mkdir $GOPATH/bin
-
-    cd $GOPATH/src/github.com/mitchellh/packer
-
-    # Don't fetch the deps
-    substituteInPlace "Makefile" --replace ': deps' ':'
-
-    # Avoid using git
-    sed \
-      -e "s|GITBRANCH:=.*||" \
-      -e "s|GITSHA:=.*|GITSHA=${src.rev}|" \
-      -i Makefile
-    sed \
-      -e "s|GIT_COMMIT=.*|GIT_COMMIT=${src.rev}|" \
-      -e "s|GIT_DIRTY=.*|GIT_DIRTY=|" \
-      -i "scripts/build.sh"
-  '';
-
-  buildPhase = ''
-    make generate releasebin
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv bin/* $out/bin
-  '';
+  src = fetchFromGitHub {
+    owner = "mitchellh";
+    repo = "packer";
+    rev = "v${version}";
+    sha256 = "05wd8xf4nahpg96wzligk5av10p0xd2msnb3imk67qgbffrlvmvi";
+  };
 
   meta = with stdenv.lib; {
     description = "A tool for creating identical machine images for multiple platforms from a single source configuration";
diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix
deleted file mode 100644
index 25098219ea2..00000000000
--- a/pkgs/development/tools/packer/deps.nix
+++ /dev/null
@@ -1,560 +0,0 @@
-{ stdenv, lib, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
-
-buildGoPackage rec {
-  name = "packer-${version}";
-  version = "20160507-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
-
-  buildInputs = [ gox gotools ];
-  
-  goPackagePath = "github.com/mitchellh/packer";
-
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/mitchellh/packer";
-    sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10";
-  };
-
-  extraSrcs = [
-    {
-      goPackagePath = "github.com/ActiveState/tail";
-
-      src = fetchgit {
-        url = "https://github.com/ActiveState/tail";
-        rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c";
-        sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d";
-      };
-    }
-    {
-      goPackagePath = "github.com/Azure/azure-sdk-for-go";
-
-      src = fetchgit {
-        url = "https://github.com/Azure/azure-sdk-for-go";
-        rev = "a1883f7b98346e4908a6c25230c95a8a3026a10c";
-        sha256 = "0pxqi0b8qwcc687si3zh6w1d594rxd6kn2wzx23clbp2nc5w3wf4";
-      };
-    }
-    {
-      goPackagePath = "github.com/Azure/go-autorest";
-
-      src = fetchgit {
-        url = "https://github.com/Azure/go-autorest";
-        rev = "b01ec2b60f95678fa759f796bac3c6b9bceaead4";
-        sha256 = "1vqwy4m26ps5lmp066zgiz04s7r2dwa832zjlfmpgha7id16pa0c";
-      };
-    }
-    {
-      goPackagePath = "github.com/Azure/go-ntlmssp";
-
-      src = fetchgit {
-        url = "https://github.com/Azure/go-ntlmssp";
-        rev = "e0b63eb299a769ea4b04dadfe530f6074b277afb";
-        sha256 = "19bn9ds12cyf8y3w5brnxwg8lwdkg16ww9hmnq14y2kmli42l14m";
-      };
-    }
-    {
-      goPackagePath = "github.com/armon/go-radix";
-
-      src = fetchgit {
-        url = "https://github.com/armon/go-radix";
-        rev = "4239b77079c7b5d1243b7b4736304ce8ddb6f0f2";
-        sha256 = "0md8li1gv4ji4vr63cfa2bcmslba94dzw6awzn5ndnpmdb7np6vh";
-      };
-    }
-    {
-      goPackagePath = "github.com/aws/aws-sdk-go";
-
-      src = fetchgit {
-        url = "https://github.com/aws/aws-sdk-go";
-        rev = "8041be5461786460d86b4358305fbdf32d37cfb2";
-        sha256 = "06ilyl1z5mn6i0afd8ila4lr2vwqdgq5zby8v4v2g3dd39qi6jq2";
-      };
-    }
-    {
-      goPackagePath = "github.com/bgentry/speakeasy";
-
-      src = fetchgit {
-        url = "https://github.com/bgentry/speakeasy";
-        rev = "36e9cfdd690967f4f690c6edcc9ffacd006014a0";
-        sha256 = "0grr82p10dk51l082xaqkpq3izj5bhby3l15gj866kngybfb4nzr";
-      };
-    }
-    {
-      goPackagePath = "github.com/dgrijalva/jwt-go";
-
-      src = fetchgit {
-        url = "https://github.com/dgrijalva/jwt-go";
-        rev = "f2193411bd642f7db03249fd79d5292c9b34916a";
-        sha256 = "0nkzn8i5f7x3wyi7mhhj9vpdbkdjvrb9hhrw0fqy6vcghia6dhrj";
-      };
-    }
-    {
-      goPackagePath = "github.com/digitalocean/godo";
-
-      src = fetchgit {
-        url = "https://github.com/digitalocean/godo";
-        rev = "6ca5b770f203b82a0fca68d0941736458efa8a4f";
-        sha256 = "00di15gdv47jfdr1l8cqphmlv5bzalxk7dk53g3mif7vwhs8749j";
-      };
-    }
-    {
-      goPackagePath = "github.com/dylanmei/iso8601";
-
-      src = fetchgit {
-        url = "https://github.com/dylanmei/iso8601";
-        rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4";
-        sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1";
-      };
-    }
-    {
-      goPackagePath = "github.com/dylanmei/winrmtest";
-
-      src = fetchgit {
-        url = "https://github.com/dylanmei/winrmtest";
-        rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5";
-        sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-ini/ini";
-
-      src = fetchgit {
-        url = "https://github.com/go-ini/ini";
-        rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
-        sha256 = "0dl5ibrrq2i887i0bf8a9m887rhnpgv6wmwyc1sj8a75c0yd02da";
-      };
-    }
-    {
-      goPackagePath = "github.com/google/go-querystring";
-
-      src = fetchgit {
-        url = "https://github.com/google/go-querystring";
-        rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0";
-        sha256 = "117211606pv0p3p4cblpnirrrassprrvvcq2svwpplsq5vff1rka";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/atlas-go";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/atlas-go";
-        rev = "95fa852edca41c06c4ce526af4bb7dec4eaad434";
-        sha256 = "002lpvxi6my8dk4d4ks091ad66bj6rnz4xchbzpqwvp7n8097aqz";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/errwrap";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/errwrap";
-        rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
-        sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-checkpoint";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-checkpoint";
-        rev = "e4b2dc34c0f698ee04750bf2035d8b9384233e1b";
-        sha256 = "0qjfk1fh5zmn04yzxn98zam8j4ay5mzd5kryazqj01hh7szd0sh5";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-cleanhttp";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-cleanhttp";
-        rev = "875fb671b3ddc66f8e2f0acc33829c8cb989a38d";
-        sha256 = "0ammv6gn9cmh6padaaw76wa6xvg22a9b3sw078v9chcvfk2bggha";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-multierror";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-multierror";
-        rev = "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5";
-        sha256 = "0dc02mvv11hvanh12nhw8jsislnxf6i4gkh6vcil0x23kj00z3iz";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-rootcerts";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-rootcerts";
-        rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00";
-        sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/go-version";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/go-version";
-        rev = "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38";
-        sha256 = "0ibqaq6z02himzci4krbfhqdi8fw2gzj9a8z375nl3qbzdgzqnm7";
-      };
-    }
-    {
-      goPackagePath = "github.com/hashicorp/yamux";
-
-      src = fetchgit {
-        url = "https://github.com/hashicorp/yamux";
-        rev = "df949784da9ed028ee76df44652e42d37a09d7e4";
-        sha256 = "080bmbdaq88ri2pn63mcjc4kq2y2sy1742ypqfgrvwssa1ynvnhy";
-      };
-    }
-    {
-      goPackagePath = "github.com/hpcloud/tail";
-
-      src = fetchgit {
-        url = "https://github.com/hpcloud/tail";
-        rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c";
-        sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d";
-      };
-    }
-    {
-      goPackagePath = "github.com/jmespath/go-jmespath";
-
-      src = fetchgit {
-        url = "https://github.com/jmespath/go-jmespath";
-        rev = "c01cf91b011868172fdcd9f41838e80c9d716264";
-        sha256 = "0lp2m33a6x2pjbv5xlbbcr48qri32s84hcgm3xmgvmrx6zyi74zg";
-      };
-    }
-    {
-      goPackagePath = "github.com/kardianos/osext";
-
-      src = fetchgit {
-        url = "https://github.com/kardianos/osext";
-        rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
-        sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/compress";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/compress";
-        rev = "f86d2e6d8a77c6a2c4e42a87ded21c6422f7557e";
-        sha256 = "17f9zxrs2k8q5kghppjnbn0xzl3i4fgl4852kj8cg94b51s5ll9f";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/cpuid";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/cpuid";
-        rev = "349c675778172472f5e8f3a3e0fe187e302e5a10";
-        sha256 = "1y7gqpcpcb29ws77328vfm30s8nsrbxyylfpb8ksb8wwg062yv6v";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/crc32";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/crc32";
-        rev = "999f3125931f6557b991b2f8472172bdfa578d38";
-        sha256 = "1sxnq3i7wvcdqx0l91jc04nf5584ym8dxzkz3xvivm8p7kz2xjns";
-      };
-    }
-    {
-      goPackagePath = "github.com/klauspost/pgzip";
-
-      src = fetchgit {
-        url = "https://github.com/klauspost/pgzip";
-        rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d";
-        sha256 = "00jcx3pdwxi4r2l3m4b8jb17b2srckz488cmjvd1vqkr85a0jp2x";
-      };
-    }
-    {
-      goPackagePath = "github.com/kr/fs";
-
-      src = fetchgit {
-        url = "https://github.com/kr/fs";
-        rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
-        sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
-      };
-    }
-    {
-      goPackagePath = "github.com/masterzen/simplexml";
-
-      src = fetchgit {
-        url = "https://github.com/masterzen/simplexml";
-        rev = "95ba30457eb1121fa27753627c774c7cd4e90083";
-        sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz";
-      };
-    }
-    {
-      goPackagePath = "github.com/masterzen/winrm";
-
-      src = fetchgit {
-        url = "https://github.com/masterzen/winrm";
-        rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa";
-        sha256 = "1d4khg7c4vw645id0x301zkgidm4ah6nkmiq52j8wsivi85yhn66";
-      };
-    }
-    {
-      goPackagePath = "github.com/masterzen/xmlpath";
-
-      src = fetchgit {
-        url = "https://github.com/masterzen/xmlpath";
-        rev = "13f4951698adc0fa9c1dda3e275d489a24201161";
-        sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk";
-      };
-    }
-    {
-      goPackagePath = "github.com/mattn/go-isatty";
-
-      src = fetchgit {
-        url = "https://github.com/mattn/go-isatty";
-        rev = "56b76bdf51f7708750eac80fa38b952bb9f32639";
-        sha256 = "0l8lcp8gcqgy0g1cd89r8vk96nami6sp9cnkx60ms1dn6cqwf5n3";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/cli";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/cli";
-        rev = "5c87c51cedf76a1737bf5ca3979e8644871598a6";
-        sha256 = "1ajxzh3winjnmqhd4yn6b6f155vfzi0dszhzl4a00zb5pdppp1rd";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/go-fs";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/go-fs";
-        rev = "a34c1b9334e86165685a9449b782f20465eb8c69";
-        sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/go-homedir";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/go-homedir";
-        rev = "d682a8f0cf139663a984ff12528da460ca963de9";
-        sha256 = "0vsiby9fbkaz7q067wmc6s5pzgpq4gdfx66cj2a1lbdarf7j1kbs";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/go-vnc";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/go-vnc";
-        rev = "723ed9867aed0f3209a81151e52ddc61681f0b01";
-        sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/iochan";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/iochan";
-        rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7";
-        sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/mapstructure";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/mapstructure";
-        rev = "281073eb9eb092240d33ef253c404f1cca550309";
-        sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/multistep";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/multistep";
-        rev = "162146fc57112954184d90266f4733e900ed05a5";
-        sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/panicwrap";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/panicwrap";
-        rev = "a1e50bc201f387747a45ffff020f1af2d8759e88";
-        sha256 = "0w5y21psgrl1afsap613c3qw84ik7zhnalnv3bf6r51hyv187y69";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/prefixedio";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/prefixedio";
-        rev = "6e6954073784f7ee67b28f2d22749d6479151ed7";
-        sha256 = "0an2pnnda33ns94v7x0sv9kmsnk62r8xm0cj4d69f2p63r85fdp6";
-      };
-    }
-    {
-      goPackagePath = "github.com/mitchellh/reflectwalk";
-
-      src = fetchgit {
-        url = "https://github.com/mitchellh/reflectwalk";
-        rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
-        sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq";
-      };
-    }
-    {
-      goPackagePath = "github.com/nu7hatch/gouuid";
-
-      src = fetchgit {
-        url = "https://github.com/nu7hatch/gouuid";
-        rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3";
-        sha256 = "175alsrjb2a1qzwp1l323vwwpirzaj95yfqqfi780698myhpb52k";
-      };
-    }
-    {
-      goPackagePath = "github.com/packer-community/winrmcp";
-
-      src = fetchgit {
-        url = "https://github.com/packer-community/winrmcp";
-        rev = "f1bcf36a69fa2945e65dd099eee11b560fbd3346";
-        sha256 = "0pj5gfbmx507lp1w3gfn23x0rn0x5rih9nqij9g8d9c4m1sx3275";
-      };
-    }
-    {
-      goPackagePath = "github.com/pierrec/lz4";
-
-      src = fetchgit {
-        url = "https://github.com/pierrec/lz4";
-        rev = "383c0d87b5dd7c090d3cddefe6ff0c2ffbb88470";
-        sha256 = "0l23bmzqfvgh61zlikj6iakg0kz7lybs8zf0nscylskl2hlr09rp";
-      };
-    }
-    {
-      goPackagePath = "github.com/pierrec/xxHash";
-
-      src = fetchgit {
-        url = "https://github.com/pierrec/xxHash";
-        rev = "5a004441f897722c627870a981d02b29924215fa";
-        sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja";
-      };
-    }
-    {
-      goPackagePath = "github.com/pkg/sftp";
-
-      src = fetchgit {
-        url = "https://github.com/pkg/sftp";
-        rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5";
-        sha256 = "0v6g9j9pnkqz72x5409y8gd8ycniziydvsjb4298dkd21d3b94dg";
-      };
-    }
-    {
-      goPackagePath = "github.com/rackspace/gophercloud";
-
-      src = fetchgit {
-        url = "https://github.com/rackspace/gophercloud";
-        rev = "53d1dc4400e1ebcd37a0e01d8c1fe2f4db3b99d2";
-        sha256 = "0rdyljj395k1w7xnxw1i76w29fgl517mvs7bsqll35lss2gbhan2";
-      };
-    }
-    {
-      goPackagePath = "github.com/satori/go.uuid";
-
-      src = fetchgit {
-        url = "https://github.com/satori/go.uuid";
-        rev = "d41af8bb6a7704f00bc3b7cba9355ae6a5a80048";
-        sha256 = "0lw8k39s7hab737rn4nngpbsganrniiv7px6g41l6f6vci1skyn2";
-      };
-    }
-    {
-      goPackagePath = "github.com/tent/http-link-go";
-
-      src = fetchgit {
-        url = "https://github.com/tent/http-link-go";
-        rev = "ac974c61c2f990f4115b119354b5e0b47550e888";
-        sha256 = "0iwq842pvp5y77cr25yanj1cgqzmkz1aw6jzgjrrmlqqkdad5z8c";
-      };
-    }
-    {
-      goPackagePath = "github.com/ugorji/go";
-
-      src = fetchgit {
-        url = "https://github.com/ugorji/go";
-        rev = "646ae4a518c1c3be0739df898118d9bccf993858";
-        sha256 = "0njncpdbh115l5mxyks08jh91kdmy0mvbmxj9mr1psv5k97gf0pn";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/crypto";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/crypto";
-        rev = "1f22c0103821b9390939b6776727195525381532";
-        sha256 = "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/net";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/net";
-        rev = "6ccd6698c634f5d835c40c1c31848729e0cecda1";
-        sha256 = "05c7kdjkvf7hrdiv1k12nyss6s8chhakqn1adxbrrahr6rl1nhpj";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/oauth2";
-
-      src = fetchgit {
-        url = "https://go.googlesource.com/oauth2";
-        rev = "8a57ed94ffd43444c0879fe75701732a38afc985";
-        sha256 = "10pxnbsy1lnx7a1x6g3cna5gdm11aal1r446dpmpgj94xiw96mxv";
-      };
-    }
-    {
-      goPackagePath = "google.golang.org/api";
-
-      src = fetchgit {
-        url = "https://code.googlesource.com/google-api-go-client";
-        rev = "ddff2aff599105a55549cf173852507dfa094b7f";
-        sha256 = "03058zh0v997fxmlvd8r4m63r3z0fzg6fval6wnxw3wq22m7h3yx";
-      };
-    }
-    {
-      goPackagePath = "google.golang.org/cloud";
-
-      src = fetchgit {
-        url = "https://code.googlesource.com/gocloud";
-        rev = "5a3b06f8b5da3b7c3a93da43163b872c86c509ef";
-        sha256 = "03zrw3mgh82gvfgz17k97n8hivnvvplc42c7vyr76i90n1mv29g7";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/fsnotify.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/fsnotify.v1";
-        rev = "8611c35ab31c1c28aa903d33cf8b6e44a399b09e";
-        sha256 = "17a7z88860hhmbgmpc2si1n67s8zk3vzwv5r4wyhrsljcq0bcv9q";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/tomb.v1";
-
-      src = fetchgit {
-        url = "https://gopkg.in/tomb.v1";
-        rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
-        sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/xmlpath.v2";
-
-      src = fetchgit {
-        url = "https://gopkg.in/xmlpath.v2";
-        rev = "860cbeca3ebcc600db0b213c0e83ad6ce91f5739";
-        sha256 = "0jgvd0y78fir4vkcj8acs0pdvlc0xr7i7cspbkm2yjm8wv23p63h";
-      };
-    }
-  ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ddf6df2369..07759b0a416 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -161,17 +161,7 @@ in
 
   fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { };
 
-  packer = callPackage ../development/tools/packer {
-    # Go 1.7 changed the linker flag format
-    buildGoPackage = buildGo16Package;
-    gotools = self.gotools.override {
-      buildGoPackage = buildGo16Package;
-      go = self.go_1_6;
-    };
-    gox = self.gox.override {
-      buildGoPackage = buildGo16Package;
-    };
-  };
+  packer = callPackage ../development/tools/packer { };
 
   fetchpatch = callPackage ../build-support/fetchpatch { };
 

From d222761121544aabe44edd9c518b9f22aa02cf3b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 4 Jan 2017 17:20:00 -0500
Subject: [PATCH 27/90] atom: 1.12.7 -> 1.12.8

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 58eb2e568c1..366233d451f 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.12.7";
+  version = "1.12.8";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1kkw6wixri8iddnmscza1d4riq4m9yr78y0d9y76vdnxarma0bfq";
+    sha256 = "1kxydw8pzz2c55vl2fzn6dnfkqcr1hkx55k10g7z86afmc7g9vxv";
     name = "${name}.deb";
   };
 

From 31ac32a9659fa1fbdefebc38c0fb42b34ed2ad8f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:08:06 +0100
Subject: [PATCH 28/90] pythonPackages.blinker: 1.3 -> 1.4

---
 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 949cb86d2c2..eca41433a5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2865,11 +2865,11 @@ in {
 
   blinker = buildPythonPackage rec {
     name = "blinker-${version}";
-    version = "1.3";
+    version = "1.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/blinker/${name}.tar.gz";
-      sha256 = "6811010809262261e41ab7b92f3f6d23f35cf816fbec2bc05077992eebec6e2f";
+      sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7";
     };
 
     meta = {

From fa696a3e7097bf56f5e6069f20b2979de6d49a0b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:08:36 +0100
Subject: [PATCH 29/90] pythonPackages.construct: 2.5.2 -> 2.8.10

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eca41433a5a..f5205e68574 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4125,15 +4125,22 @@ in {
 
 
   construct = buildPythonPackage rec {
-    name = "construct-2.5.2";
+    name = "construct-${version}";
+    version = "2.8.10";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/construct/${name}.tar.gz";
-      sha256 = "084h02p0m8lhmlywlwjdg0kd0hd6sz481c96qwcm5wddxrqn4nv6";
+    src = pkgs.fetchFromGitHub {
+      owner = "construct";
+      repo = "construct";
+      rev = "v${version}";
+      sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3";
     };
 
     propagatedBuildInputs = with self; [ six ];
 
+    # Tests fail with the following error on Python 3.5+
+    # TypeError: not all arguments converted during string formatting
+    doCheck = pythonOlder "3.5";
+
     meta = {
       description = "Powerful declarative parser (and builder) for binary data";
       homepage = http://construct.readthedocs.org/;

From da8023b8c376f78207504113577cd4950a77057c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:08:53 +0100
Subject: [PATCH 30/90] pythonPackages.cssutils: 0.9.9 -> 1.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f5205e68574..c3aa172022b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5413,11 +5413,11 @@ in {
   };
 
   cssutils = buildPythonPackage (rec {
-    name = "cssutils-0.9.9";
+    name = "cssutils-1.0.1";
 
     src = pkgs.fetchurl {
-      url = mirror://pypi/c/cssutils/cssutils-0.9.9.zip;
-      sha256 = "139yfm9yz9k33kgqw4khsljs10rkhhxyywbq9i82bh2r31cil1pp";
+      url = mirror://pypi/c/cssutils/cssutils-1.0.1.tar.gz;
+      sha256 = "0qwha9x1wml2qmipbcz03gndnlwhzrjdvw9i09si247a90l8p8fq";
     };
 
     buildInputs = with self; [ self.mock ];

From 46fe0fe8ae8b70e60aa79d9db38c9b98e4c0ee1a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:09:36 +0100
Subject: [PATCH 31/90] pythonPackages.pyperclip: 1.5.11 -> 1.5.27

---
 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 c3aa172022b..9f857ba4105 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21508,12 +21508,12 @@ in {
   };
 
   pyperclip = buildPythonPackage rec {
-    version = "1.5.11";
+    version = "1.5.27";
     name = "pyperclip-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pyperclip/${name}.zip";
-      sha256 = "07q8krmi7phizzp192x3j7xbk1gzhc1kc3jp4mxrm32dn84sp1vh";
+      sha256 = "1i9zxm7qc49n9yxfb41c0jbmmp2hpzx98kaizjl7qmgiv3snvjx3";
     };
 
     doCheck = false;

From 838862cb42e979188d01ddbbf3a78cc11112c728 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:10:26 +0100
Subject: [PATCH 32/90] pythonPackages.urwid: 1.3.0 -> 1.3.1

---
 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 9f857ba4105..8608f33ffab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26195,14 +26195,14 @@ in {
 
 
   urwid = buildPythonPackage (rec {
-    name = "urwid-1.3.0";
+    name = "urwid-1.3.1";
 
     # multiple:  NameError: name 'evl' is not defined
     doCheck = false;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/u/urwid/${name}.tar.gz";
-      sha256 = "29f04fad3bf0a79c5491f7ebec2d50fa086e9d16359896c9204c6a92bc07aba2";
+      sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng";
     };
 
     meta = {

From 956a400b81434800f9d0138e3e0a45c552e65f9c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:13:46 +0100
Subject: [PATCH 33/90] pythonPackages.brotlipy: init at 0.6.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8608f33ffab..d913cca3e10 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14640,6 +14640,23 @@ in {
     };
   };
 
+  brotlipy = buildPythonPackage rec {
+    name = "brotlipy-${version}";
+    version = "0.6.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/b/brotlipy/${name}.tar.gz";
+      sha256 = "10s2y19zywfkf3sksrw81czhva759aki0clld2pnnlgf64sz7016";
+    };
+
+    propagatedBuildInputs = with self; [ cffi enum34 construct ];
+
+    meta = {
+      description = "Python bindings for the reference Brotli encoder/decoder";
+      homepage = "https://github.com/python-hyper/brotlipy/";
+      license = licenses.mit;
+    };
+  };
 
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";

From f594ee195b486eed9072aed90bdb65f3b57e29aa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:14:18 +0100
Subject: [PATCH 34/90] pythonPackages.sortedcontainers: init at 1.5.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d913cca3e10..87ceb25392c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14658,6 +14658,26 @@ in {
     };
   };
 
+  sortedcontainers = buildPythonPackage rec {
+    name = "sortedcontainers-${version}";
+    version = "1.5.7";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/sortedcontainers/${name}.tar.gz";
+      sha256 = "1sjh8lccbmvwna91mlhl5m3z4320p07h063b8x8br4p4cll49w0g";
+    };
+
+    # tries to run tests for all python versions and uses virtualenv weirdly
+    doCheck = false;
+    #buildInputs = with self; [ tox nose ];
+
+    meta = {
+      description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet";
+      homepage = "http://www.grantjenks.com/docs/sortedcontainers/";
+      license = licenses.asl20;
+    };
+  };
+
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";
     name = "${baseName}-${version}";

From cde1874b15b3daed7c810d76bc06ead7e3786906 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:14:58 +0100
Subject: [PATCH 35/90] pythonPackages.hyperframe: init at 4.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87ceb25392c..c7f68105af9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14678,6 +14678,22 @@ in {
     };
   };
 
+  hyperframe = buildPythonPackage rec {
+    name = "hyperframe-${version}";
+    version = "4.0.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/h/hyperframe/${name}.tar.gz";
+      sha256 = "0hsfq0jigwa0i58z7vbnp62l7za49gmlg75vnygq2ijhkidkcmwa";
+    };
+
+    meta = {
+      description = "HTTP/2 framing layer for Python";
+      homepage = "http://hyper.rtfd.org/";
+      license = licenses.mit;
+    };
+  };
+
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";
     name = "${baseName}-${version}";

From e7ee0264f9124e7c7c6cd299a680a139b40332f7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:15:27 +0100
Subject: [PATCH 36/90] pythonPackages.h2: init at 2.5.1

---
 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 c7f68105af9..97bf79ee283 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14694,6 +14694,24 @@ in {
     };
   };
 
+  h2 = buildPythonPackage rec {
+    name = "h2-${version}";
+    version = "2.5.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/h/h2/${name}.tar.gz";
+      sha256 = "0xhzm5vcfhdq3mihynwh4ljwi0r06lvzk3ypr0gmmbcp1x43ffb7";
+    };
+
+    propagatedBuildInputs = with self; [ enum34 hpack hyperframe ];
+
+    meta = {
+      description = "HTTP/2 State-Machine based protocol implementation";
+      homepage = "http://hyper.rtfd.org/";
+      license = licenses.mit;
+    };
+  };
+
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";
     name = "${baseName}-${version}";

From 85d3e82f4b8a1b02676879eb702e7a4384cc35b9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:15:57 +0100
Subject: [PATCH 37/90] pythonPackages.editorconfig: init at 0.12.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 97bf79ee283..2840376e763 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14712,6 +14712,22 @@ in {
     };
   };
 
+  editorconfig = buildPythonPackage rec {
+    name = "EditorConfig-${version}";
+    version = "0.12.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/e/editorconfig/${name}.tar.gz";
+      sha256 = "1qxqy9wfrpb2ldrk5nzidkpymc55lpf9lg3m8c8a5531jmbwhlwb";
+    };
+
+    meta = {
+      description = "EditorConfig File Locator and Interpreter for Python";
+      homepage = "http://editorconfig.org/";
+      license = licenses.psfl;
+    };
+  };
+
   mitmproxy = buildPythonPackage rec {
     baseName = "mitmproxy";
     name = "${baseName}-${version}";

From e373c3f332fec52a1e60ec0738b510d3edb7f825 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:25:20 +0100
Subject: [PATCH 38/90] pythonPackages.typing: init at 3.5.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2840376e763..bac15ab33e7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23008,6 +23008,22 @@ in {
     };
   };
 
+  typing = buildPythonPackage rec {
+    name = "typing-${version}";
+    version = "3.5.3.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/t/typing/${name}.tar.gz";
+      sha256 = "08gz3grrh3vph5ib1w5x1ssnpzvj077x030lx63fxs4kwg3slbfa";
+    };
+
+    meta = {
+      description = "Backport of typing module to Python versions older than 3.5";
+      homepage = "https://docs.python.org/3.5/library/typing.html";
+      license = licenses.psfl;
+    };
+  };
+
   ruamel_yaml = buildPythonPackage rec {
     name = "ruamel.yaml-${version}";
     version = "0.10.13";

From 8f146f96dbb52ba1cdfbbcffe4f9e22f7f4cd9ee Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:16:25 +0100
Subject: [PATCH 39/90] pythonPackages.hpack: 2.0.1 -> 2.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bac15ab33e7..1d2a5089cae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15634,20 +15634,13 @@ in {
 
   hpack = buildPythonPackage rec {
     name = "hpack-${version}";
-    version = "2.0.1";
+    version = "2.3.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/h/hpack/hpack-${version}.tar.gz";
-      sha256 = "1k4wa8c52bd6x109bn6hc945595w6aqgzj6ipy6c2q7vxkzalzhd";
+      sha256 = "1ad0fx4d7a52zf441qzhjc7vwy9v3qdrk1zyf06ikz8y2nl9mgai";
     };
 
-    propagatedBuildInputs = with self; [
-
-    ];
-    buildInputs = with self; [
-
-    ];
-
     meta = with stdenv.lib; {
       description = "========================================";
       homepage = "http://hyper.rtfd.org";

From 71725619a86184b8496eca42436ecb372c3fa163 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:16:58 +0100
Subject: [PATCH 40/90] pythonPackages.ruamel_yaml: 0.10.13 -> 0.13.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d2a5089cae..3a4218c1f21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23019,14 +23019,20 @@ in {
 
   ruamel_yaml = buildPythonPackage rec {
     name = "ruamel.yaml-${version}";
-    version = "0.10.13";
+    version = "0.13.7";
+
+    # needs ruamel_ordereddict for python2 support
+    disabled = !isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/ruamel.yaml/${name}.tar.gz";
-      sha256 = "0r9mn5lm9dcxpy0wpn18cp7i5hkvjvknv3dxg8d9ca6km39m4asn";
+      sha256 = "1vca2552k0kmhr9msg1bbfdvp3p9im17x1a6npaw221vlgg15z7h";
     };
 
-    propagatedBuildInputs = with self; [ ruamel_base ruamel_ordereddict ];
+    # Tests cannot load the module to test
+    doCheck = false;
+
+    propagatedBuildInputs = with self; [ ruamel_base typing ];
 
     meta = {
       description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";

From e94bfe55c4804d861cf1b226ed18b045cea68eb3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 4 Jan 2017 09:18:04 +0100
Subject: [PATCH 41/90] mitmproxy: 0.17.1 -> 1.0.2, move to all-packages.nix

---
 pkgs/tools/networking/mitmproxy/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 pkgs/top-level/python-packages.nix          | 27 ------------------
 3 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/tools/networking/mitmproxy/default.nix

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
new file mode 100644
index 00000000000..8e82023d50a
--- /dev/null
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+  baseName = "mitmproxy";
+  name = "${baseName}-${version}";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = baseName;
+    repo = baseName;
+    rev = "v${version}";
+    sha256 = "19nqg7s1034fal8sb2rjssgcpvxh50yidyjhnbfmmi8v3fbvpbwl";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    pyopenssl pyasn1 urwid pillow flask click pyperclip blinker
+    construct pyparsing html2text tornado brotlipy requests2
+    sortedcontainers passlib cssutils h2 ruamel_yaml jsbeautifier
+    watchdog editorconfig
+  ];
+
+  # Tests fail due to an error with a decorator
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Man-in-the-middle proxy";
+    homepage = "http://mitmproxy.org/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c247b5dddf..9ca802571cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2818,6 +2818,8 @@ in
 
   miredo = callPackage ../tools/networking/miredo { };
 
+  mitmproxy = callPackage ../tools/networking/mitmproxy { };
+
   mjpegtoolsFull = callPackage ../tools/video/mjpegtools { };
 
   mjpegtools = self.mjpegtoolsFull.override {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a4218c1f21..e99e70ec379 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14728,33 +14728,6 @@ in {
     };
   };
 
-  mitmproxy = buildPythonPackage rec {
-    baseName = "mitmproxy";
-    name = "${baseName}-${version}";
-    version = "0.17.1";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "mitmproxy";
-      repo = "mitmproxy";
-      rev = "v${version}";
-      sha256 = "0a50mkvm3zf9cbs0pf6bwy00bhmy4d1l9as8c9m0bgrk6hq7h53p";
-    };
-
-    propagatedBuildInputs = with self; [
-      pyopenssl pyasn1 urwid pillow lxml flask protobuf click
-      ConfigArgParse pyperclip blinker construct pyparsing html2text tornado
-    ];
-
-    doCheck = false;
-
-    meta = {
-      description = ''Man-in-the-middle proxy'';
-      homepage = "http://mitmproxy.org/";
-      license = licenses.mit;
-      broken = true;
-    };
-  };
-
   mock = buildPythonPackage (rec {
     name = "mock-2.0.0";
 

From fe9373460c08c83449657b22c026c806bec92d21 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 5 Jan 2017 06:40:43 +0100
Subject: [PATCH 42/90] pythonPackages.pycrypto: add patch to fix CVE-2013-7459

cc #21642
---
 pkgs/development/python-modules/pycrypto/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 0cbe4491d67..182a8c6f7fa 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
+{ stdenv, fetchurl, fetchpatch, python, buildPythonPackage, gmp }:
 
 buildPythonPackage rec {
   name = "pycrypto-2.6.1";
@@ -9,6 +9,14 @@ buildPythonPackage rec {
     sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2013-7459.patch";
+      url = "https://anonscm.debian.org/cgit/collab-maint/python-crypto.git/plain/debian/patches/CVE-2013-7459.patch?h=debian/2.6.1-7";
+      sha256 = "01r7aghnchc1bpxgdv58qyi2085gh34bxini973xhy3ks7fq3ir9";
+    })
+  ];
+
   preConfigure = ''
     sed -i 's,/usr/include,/no-such-dir,' configure
     sed -i "s!,'/usr/include/'!!" setup.py

From 4029470a6fa3c181b457debbf8f96e84de3f39e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 2 Jan 2017 07:46:46 +0100
Subject: [PATCH 43/90] zfs: add unstable variant

Until now nixos only delivered the latest zfs release. This release is often not
compatible with the latest mainline kernel. Therefor an unstable variant is
added, which might be based on testing releases or git revisions.

fixes #21359
---
 nixos/modules/tasks/filesystems/zfs.nix    |  50 +++--
 pkgs/os-specific/linux/spl/default.nix     |  96 +++++----
 pkgs/os-specific/linux/zfs/default.nix     | 240 ++++++++++++---------
 pkgs/os-specific/linux/zfs/nix-build.patch | 134 ------------
 pkgs/top-level/all-packages.nix            |  26 ++-
 5 files changed, 245 insertions(+), 301 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/zfs/nix-build.patch

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index c5f41cc338c..045cbeb7cff 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -22,12 +22,18 @@ let
 
   kernel = config.boot.kernelPackages;
 
-  splKernelPkg = kernel.spl;
-  zfsKernelPkg = kernel.zfs;
-  zfsUserPkg = pkgs.zfs;
+  packages = if config.boot.zfs.enableUnstable then {
+    spl = kernel.splUnstable;
+    zfs = kernel.zfsUnstable;
+    zfsUser = pkgs.zfsUnstable;
+  } else {
+    spl = kernel.spl;
+    zfs = kernel.zfs;
+    zfsUser = pkgs.zfs;
+  };
 
   autosnapPkg = pkgs.zfstools.override {
-    zfs = zfsUserPkg;
+    zfs = packages.zfsUser;
   };
 
   zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot";
@@ -54,6 +60,18 @@ in
 
   options = {
     boot.zfs = {
+      enableUnstable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Use the unstable zfs package. This might be an option, if the latest
+          kernel is not yet supported by a published release of ZFS. Enabling
+          this option will install a development version of ZFS on Linux. The
+          version will have already passed an extensive test suite, but it is
+          more likely to hit an undiscovered bug compared to running a released
+          version of ZFS on Linux.
+        '';
+      };
 
       extraPools = mkOption {
         type = types.listOf types.str;
@@ -218,16 +236,16 @@ in
 
       boot = {
         kernelModules = [ "spl" "zfs" ] ;
-        extraModulePackages = [ splKernelPkg zfsKernelPkg ];
+        extraModulePackages = with packages; [ spl zfs ];
       };
 
       boot.initrd = mkIf inInitrd {
         kernelModules = [ "spl" "zfs" ];
         extraUtilsCommands =
           ''
-            copy_bin_and_libs ${zfsUserPkg}/sbin/zfs
-            copy_bin_and_libs ${zfsUserPkg}/sbin/zdb
-            copy_bin_and_libs ${zfsUserPkg}/sbin/zpool
+            copy_bin_and_libs ${packages.zfsUser}/sbin/zfs
+            copy_bin_and_libs ${packages.zfsUser}/sbin/zdb
+            copy_bin_and_libs ${packages.zfsUser}/sbin/zpool
           '';
         extraUtilsCommandsTest = mkIf inInitrd
           ''
@@ -264,14 +282,14 @@ in
         zfsSupport = true;
       };
 
-      environment.etc."zfs/zed.d".source = "${zfsUserPkg}/etc/zfs/zed.d/*";
+      environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/*";
 
-      system.fsPackages = [ zfsUserPkg ];                  # XXX: needed? zfs doesn't have (need) a fsck
-      environment.systemPackages = [ zfsUserPkg ]
-        ++ optional enableAutoSnapshots autosnapPkg;       # so the user can run the command to see flags
+      system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck
+      environment.systemPackages = [ packages.zfsUser ]
+        ++ optional enableAutoSnapshots autosnapPkg; # so the user can run the command to see flags
 
-      services.udev.packages = [ zfsUserPkg ];             # to hook zvol naming, etc.
-      systemd.packages = [ zfsUserPkg ];
+      services.udev.packages = [ packages.zfsUser ]; # to hook zvol naming, etc.
+      systemd.packages = [ packages.zfsUser ];
 
       systemd.services = let
         getPoolFilesystems = pool:
@@ -298,7 +316,7 @@ in
               RemainAfterExit = true;
             };
             script = ''
-              zpool_cmd="${zfsUserPkg}/sbin/zpool"
+              zpool_cmd="${packages.zfsUser}/sbin/zpool"
               ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}"
             '';
           };
@@ -314,7 +332,7 @@ in
               RemainAfterExit = true;
             };
             script = ''
-              ${zfsUserPkg}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
+              ${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
             '';
           };
 
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index e84c964d675..06ad440c775 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -9,56 +9,64 @@ with stdenv.lib;
 let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
-in
 
-assert any (n: n == configFile) [ "kernel" "user" "all" ];
-assert buildKernel -> kernel != null;
+  common = { version, sha256 } @ args : stdenv.mkDerivation rec {
+    name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
-stdenv.mkDerivation rec {
-  name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+    src = fetchFromGitHub {
+      owner = "zfsonlinux";
+      repo = "spl";
+      rev = "spl-${version}";
+      inherit sha256;
+    };
 
-  version = "0.6.5.8";
+    patches = [ ./const.patch ./install_prefix.patch ];
 
-  src = fetchFromGitHub {
-    owner = "zfsonlinux";
-    repo = "spl";
-    rev = "spl-${version}";
-    sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
-  };
+    nativeBuildInputs = [ autoreconfHook ];
 
-  patches = [ ./const.patch ./install_prefix.patch ];
+    hardeningDisable = [ "pic" ];
 
-  nativeBuildInputs = [ autoreconfHook ];
-
-  hardeningDisable = [ "pic" ];
-
-  preConfigure = ''
-    substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
-    substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
-    substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
-    substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
-  '';
-
-  configureFlags = [
-    "--with-config=${configFile}"
-  ] ++ optionals buildKernel [
-    "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-    "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
-
-    longDescription = ''
-      This kernel module is a porting layer for ZFS to work inside the linux
-      kernel.
+    preConfigure = ''
+      substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
+      substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
+      substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
+      substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
     '';
 
-    homepage = http://zfsonlinux.org/;
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
+    configureFlags = [
+      "--with-config=${configFile}"
+    ] ++ optionals buildKernel [
+      "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+      "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    ];
+
+    enableParallelBuilding = true;
+
+    meta = {
+      description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
+
+      longDescription = ''
+          This kernel module is a porting layer for ZFS to work inside the linux
+          kernel.
+      '';
+
+      homepage = http://zfsonlinux.org/;
+      platforms = platforms.linux;
+      license = licenses.gpl2Plus;
+      maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
+    };
   };
-}
+
+in
+  assert any (n: n == configFile) [ "kernel" "user" "all" ];
+  assert buildKernel -> kernel != null;
+  {
+    splStable = common {
+      version = "0.6.5.8";
+      sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
+    };
+    splUnstable = common {
+      version = "0.7.0-rc2";
+      sha256 = "1y7jlyj8jwgrgnd6hiabms5h9430b6wjbnr3pwb16mv40wns1i65";
+    };
+  }
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index d7e406107b1..bd2767a66b4 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -1,117 +1,161 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
+{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch
 , configFile ? "all"
 
 # Userspace dependencies
-, zlib, libuuid, python
+, zlib, libuuid, python, attr
 
 # Kernel dependencies
-, kernel ? null, spl ? null
+, kernel ? null, spl ? null, splUnstable ? null
 }:
 
 with stdenv.lib;
 let
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
-in
 
-assert any (n: n == configFile) [ "kernel" "user" "all" ];
-assert buildKernel -> kernel != null && spl != null;
+  common = { version, sha256, extraPatches, spl, inkompatibleKernelVersion ? null } @ args:
+    if buildKernel &&
+       (inkompatibleKernelVersion != null) &&
+       versionAtLeast kernel.version inkompatibleKernelVersion then
+      throw "linux v${kernel.version} is not yet supported by zfsonlinux v${version}"
+    else stdenv.mkDerivation rec {
+      name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
-stdenv.mkDerivation rec {
-  name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+      src = fetchFromGitHub {
+        owner = "zfsonlinux";
+        repo = "zfs";
+        rev = "zfs-${version}";
+        inherit sha256;
+      };
 
-  version = "0.6.5.8";
+      patches = extraPatches;
 
-  src = fetchFromGitHub {
-    owner = "zfsonlinux";
-    repo = "zfs";
-    rev = "zfs-${version}";
-    sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a";
-  };
+      buildInputs = [ autoreconfHook nukeReferences ]
+      ++ optionals buildKernel [ spl ]
+      ++ optionals buildUser [ zlib libuuid python attr ];
 
-  patches = [ ./nix-build.patch ];
+      # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
+      NIX_CFLAGS_LINK = "-lgcc_s";
 
-  buildInputs = [ autoreconfHook nukeReferences ]
-    ++ optionals buildKernel [ spl ]
-    ++ optionals buildUser [ zlib libuuid python ];
+      hardeningDisable = [ "pic" ];
 
-  # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
-  NIX_CFLAGS_LINK = "-lgcc_s";
-
-  hardeningDisable = [ "pic" ];
-
-  preConfigure = ''
-    substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "umount -t zfs"           "${utillinux}/bin/umount -t zfs"
-    substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"
-    substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"
-    substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"
-    substituteInPlace ./udev/rules.d/*            --replace "/lib/udev/vdev_id"       "$out/lib/udev/vdev_id"
-    substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"
-    substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"
-    substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
-    substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d"
-    substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
-    substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
-    substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
-    substituteInPlace ./etc/systemd/system/zfs-share.service.in \
-        --replace "@bindir@/rm " "${coreutils}/bin/rm "
-    ./autogen.sh
-  '';
-
-  configureFlags = [
-    "--with-config=${configFile}"
-  ] ++ optionals buildUser [
-    "--with-dracutdir=$(out)/lib/dracut"
-    "--with-udevdir=$(out)/lib/udev"
-    "--with-systemdunitdir=$(out)/etc/systemd/system"
-    "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
-    "--with-mounthelperdir=$(out)/bin"
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--enable-systemd"
-  ] ++ optionals buildKernel [
-    "--with-spl=${spl}/libexec/spl"
-    "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
-    "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  enableParallelBuilding = true;
-
-  installFlags = [
-    "sysconfdir=\${out}/etc"
-    "DEFAULT_INITCONF_DIR=\${out}/default"
-  ];
-
-  postInstall = ''
-    # Prevent kernel modules from depending on the Linux -dev output.
-    nuke-refs $(find $out -name "*.ko")
-  '' + optionalString buildUser ''
-    # Remove provided services as they are buggy
-    rm $out/etc/systemd/system/zfs-import-*.service
-
-    sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
-
-    for i in $out/etc/systemd/system/*; do
-      substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
-    done
-
-    # Fix pkgconfig.
-    ln -s ../share/pkgconfig $out/lib/pkgconfig
-
-    # Remove tests because they add a runtime dependency on gcc
-    rm -rf $out/share/zfs/zfs-tests
-  '';
-
-  meta = {
-    description = "ZFS Filesystem Linux Kernel module";
-    longDescription = ''
-      ZFS is a filesystem that combines a logical volume manager with a
-      Copy-On-Write filesystem with data integrity detection and repair,
-      snapshotting, cloning, block devices, deduplication, and more.
+      preConfigure = ''
+        substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "umount -t zfs"           "${utillinux}/bin/umount -t zfs"
+        substituteInPlace ./module/zfs/zfs_ctldir.c   --replace "mount -t zfs"            "${utillinux}/bin/mount -t zfs"
+        substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount"             "${utillinux}/bin/umount"
+        substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount"              "${utillinux}/bin/mount"
+        substituteInPlace ./udev/rules.d/*            --replace "/lib/udev/vdev_id"       "$out/lib/udev/vdev_id"
+        substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/ztest"         "$out/sbin/ztest"
+        substituteInPlace ./cmd/ztest/ztest.c         --replace "/usr/sbin/zdb"           "$out/sbin/zdb"
+        substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
+        substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d"
+        substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
+        substituteInPlace ./cmd/zed/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
+        substituteInPlace ./module/Makefile.in        --replace "/bin/cp"                 "cp"
+        substituteInPlace ./etc/systemd/system/zfs-share.service.in \
+          --replace "@bindir@/rm " "${coreutils}/bin/rm "
+        ./autogen.sh
       '';
-    homepage = http://zfsonlinux.org/;
-    license = licenses.cddl;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
-  };
-}
+
+      configureFlags = [
+        "--with-config=${configFile}"
+        ] ++ optionals buildUser [
+        "--with-dracutdir=$(out)/lib/dracut"
+        "--with-udevdir=$(out)/lib/udev"
+        "--with-systemdunitdir=$(out)/etc/systemd/system"
+        "--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
+        "--with-mounthelperdir=$(out)/bin"
+        "--sysconfdir=/etc"
+        "--localstatedir=/var"
+        "--enable-systemd"
+        ] ++ optionals buildKernel [
+        "--with-spl=${spl}/libexec/spl"
+        "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+        "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+      ];
+
+      enableParallelBuilding = true;
+
+      installFlags = [
+        "sysconfdir=\${out}/etc"
+        "DEFAULT_INITCONF_DIR=\${out}/default"
+      ];
+
+      postInstall = ''
+        # Prevent kernel modules from depending on the Linux -dev output.
+        nuke-refs $(find $out -name "*.ko")
+      '' + optionalString buildUser ''
+        # Remove provided services as they are buggy
+        rm $out/etc/systemd/system/zfs-import-*.service
+
+        sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
+
+        for i in $out/etc/systemd/system/*; do
+        substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
+        done
+
+        # Fix pkgconfig.
+        ln -s ../share/pkgconfig $out/lib/pkgconfig
+
+        # Remove tests because they add a runtime dependency on gcc
+        rm -rf $out/share/zfs/zfs-tests
+      '';
+
+      meta = {
+        description = "ZFS Filesystem Linux Kernel module";
+        longDescription = ''
+          ZFS is a filesystem that combines a logical volume manager with a
+          Copy-On-Write filesystem with data integrity detection and repair,
+          snapshotting, cloning, block devices, deduplication, and more.
+        '';
+        homepage = http://zfsonlinux.org/;
+        license = licenses.cddl;
+        platforms = platforms.linux;
+        maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
+      };
+    };
+in
+  assert any (n: n == configFile) [ "kernel" "user" "all" ];
+  assert buildKernel -> kernel != null && spl != null;
+  {
+    # also check if kernel version constraints in
+    # ./nixos/modules/tasks/filesystems/zfs.nix needs
+    # to be adapted
+    zfsStable = common {
+      # comment/uncomment if breaking kernel versions are known
+      inkompatibleKernelVersion = "4.9";
+
+      version = "0.6.5.8";
+
+      # this package should point to the latest release.
+      sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a";
+      extraPatches = [
+        (fetchpatch {
+          url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";
+          sha256 = "14kqqphzg02m9a7qncdhff8958cfzdrvsid3vsrm9k75lqv1w08z";
+        })
+      ];
+      inherit spl;
+    };
+    zfsUnstable = common {
+      # comment/uncomment if breaking kernel versions are known
+      inkompatibleKernelVersion = "4.10";
+
+      version = "0.7.0-rc2";
+
+      # this package should point to a version / git revision compatible with the latest kernel release
+      sha256 = "197y2jyav9h1ksri9kzqvrwmzpb58mlgw27vfvgd4bvxpwfxq53s";
+      extraPatches = [
+        (fetchpatch {
+          url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc2...nixos-zfs-0.7.0-rc2.patch";
+          sha256 = "1p33bwd6p5r5phbqb657x8h9x3bd012k2mdmbzgnb09drh9v0r82";
+        })
+        (fetchpatch {
+          name = "Kernel_4.9_zfs_aio_fsync_removal.patch";
+          url = "https://github.com/zfsonlinux/zfs/commit/99ca173929cb693012dabe98bcee4f12ec7e6e92.patch";
+          sha256 = "10npvpj52rpq88vdsn7zkdhx2lphzvqypsd9abdadjbqkwxld9la";
+        })
+      ];
+      spl = splUnstable;
+    };
+  }
diff --git a/pkgs/os-specific/linux/zfs/nix-build.patch b/pkgs/os-specific/linux/zfs/nix-build.patch
deleted file mode 100644
index cc9e36838c7..00000000000
--- a/pkgs/os-specific/linux/zfs/nix-build.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index f8abb5f..82e8fb6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,10 +11,10 @@ endif
- if CONFIG_KERNEL
- SUBDIRS += module
- 
--extradir = @prefix@/src/zfs-$(VERSION)
-+extradir = @prefix@/libexec/zfs-$(VERSION)
- extra_HEADERS = zfs.release.in zfs_config.h.in
- 
--kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION)
-+kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION)
- nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
- endif
- 
-diff --git a/include/Makefile.am b/include/Makefile.am
-index a94cad5..a160fe2 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include
-+kerneldir = @prefix@/include
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
-index 595d1db..d41375d 100644
---- a/include/linux/Makefile.am
-+++ b/include/linux/Makefile.am
-@@ -18,6 +18,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
-+kerneldir = @prefix@/include/linux
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
-index 77ecfb2..52b3612 100644
---- a/include/sys/Makefile.am
-+++ b/include/sys/Makefile.am
-@@ -114,6 +114,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
-+kerneldir = @prefix@/include/sys
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
-index 8bca5d8..a5eafcd 100644
---- a/include/sys/fm/Makefile.am
-+++ b/include/sys/fm/Makefile.am
-@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm
-+kerneldir = @prefix@/include/sys/fm
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
-index fdc9eb5..807c47c 100644
---- a/include/sys/fm/fs/Makefile.am
-+++ b/include/sys/fm/fs/Makefile.am
-@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
-+kerneldir = @prefix@/include/sys/fm/fs
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
-index 0859b9f..b0c6eec 100644
---- a/include/sys/fs/Makefile.am
-+++ b/include/sys/fs/Makefile.am
-@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
- endif
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs
-+kerneldir = @prefix@/include/sys/fs
- kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
- endif
-diff --git a/module/Makefile.in b/module/Makefile.in
-index d4ddee2..876c811 100644
---- a/module/Makefile.in
-+++ b/module/Makefile.in
-@@ -18,9 +18,9 @@ modules:
- 	@# installed devel headers, or they may be in the module
- 	@# subdirectory when building against the spl source tree.
- 	@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
--		/bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
-+		cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
- 	elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
--		/bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
-+		cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
- 	else \
- 		echo -e "\n" \
- 		"*** Missing spl symbols ensure you have built the spl:\n" \
-@@ -28,6 +28,8 @@ modules:
- 		"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
- 		exit 1; \
- 	fi
-+	@# when copying a file out of the nix store, we need to make it writable again.
-+	chmod +w @SPL_SYMBOLS@
- 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
- 
- clean:
-@@ -42,15 +44,15 @@ clean:
- modules_install:
- 	@# Install the kernel modules
- 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
--		INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
-+		INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
- 		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
- 		KERNELRELEASE=@LINUX_VERSION@
- 	@# Remove extraneous build products when packaging
--	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
--	if [ -n "$(DESTDIR)" ]; then \
-+	kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
-+	if [ -n "@prefix@" ]; then \
- 		find $$kmoddir -name 'modules.*' | xargs $(RM); \
- 	fi
--	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
-+	sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
- 	if [ -f $$sysmap ]; then \
- 		depmod -ae -F $$sysmap @LINUX_VERSION@; \
- 	fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac48186d58f..d401d841260 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11252,10 +11252,12 @@ in
 
     seturgent = callPackage ../os-specific/linux/seturgent { };
 
-    spl = callPackage ../os-specific/linux/spl {
+    inherit (callPackage ../os-specific/linux/spl {
       configFile = "kernel";
       inherit kernel;
-    };
+    }) splStable splUnstable;
+
+    spl = splStable;
 
     sysdig = callPackage ../os-specific/linux/sysdig {};
 
@@ -11279,10 +11281,12 @@ in
 
     x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
 
-    zfs = callPackage ../os-specific/linux/zfs {
+    inherit (callPackage ../os-specific/linux/zfs {
       configFile = "kernel";
       inherit kernel spl;
-    };
+    }) zfsStable zfsUnstable;
+
+    zfs = zfsStable;
   });
 
   # The current default kernel / kernel modules.
@@ -11591,9 +11595,11 @@ in
 
   statifier = callPackage ../os-specific/linux/statifier { };
 
-  spl = callPackage ../os-specific/linux/spl {
+  inherit (callPackage ../os-specific/linux/spl {
     configFile = "user";
-  };
+  }) splStable splUnstable;
+
+  spl = splStable;
 
   sysdig = callPackage ../os-specific/linux/sysdig {
     kernel = null;
@@ -11797,9 +11803,11 @@ in
 
   zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
 
-  zfs = callPackage ../os-specific/linux/zfs {
+  inherit (callPackage ../os-specific/linux/zfs {
     configFile = "user";
-  };
+  }) zfsStable zfsUnstable;
+
+  zfs = zfsStable;
 
   ### DATA
 
@@ -14533,7 +14541,7 @@ in
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
     qt = qt4;
   };
-  
+
   qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };

From 744cd7b12bffb2d1df7603d9134b065d83e64fbb Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Thu, 5 Jan 2017 09:57:41 +0100
Subject: [PATCH 44/90] xdis: 2.3.1 -> 3.2.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0141729e30..8faff132e19 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12677,12 +12677,13 @@ in {
 
   xdis = buildPythonPackage rec {
     name = "xdis-${version}";
-    version = "2.3.1";
+    version = "3.2.4";
     src = pkgs.fetchurl {
       url = "mirror://pypi/x/xdis/${name}.tar.gz";
-      sha256 = "1bi53n9fifjz2ja5inm546vzhjpgwx6n0qrhp106fss7bdm44a4v";
+      sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk";
     };
-    propagatedBuildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ nose six ];
+
     meta = {
       description = "Python cross-version byte-code disassembler and marshal routines";
       homepage = https://github.com/rocky/python-xdis/;

From aeb311f6c0e57aae8c1c1488d9502368c92469b5 Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Thu, 5 Jan 2017 09:58:32 +0100
Subject: [PATCH 45/90] zope.testing: 4.5.0 -> 4.6.1

---
 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 8faff132e19..2f0b5e10896 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27529,11 +27529,11 @@ EOF
 
   zope_testing = buildPythonPackage rec {
     name = "zope.testing-${version}";
-    version = "4.5.0";
+    version = "4.6.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/z/zope.testing/${name}.tar.gz";
-      sha256 = "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s";
+      sha256 = "1vvxhjmzl7vw2i1akfj1xbggwn36270ym7f2ic9xwbaswfw1ap56";
     };
 
     doCheck = !isPyPy;

From 06e16f00c489fe34d03baa9fadf393d5174243bb Mon Sep 17 00:00:00 2001
From: Florian Duraffourg <f.duraffourg@gmail.com>
Date: Thu, 5 Jan 2017 10:02:33 +0100
Subject: [PATCH 46/90] Fix mount.glusterfs installation

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

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 3defa6ab123..6fd46a48639 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline,
  autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
- , liburcu, attr
+ , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which
 }:
 let 
   s = # Generated upstream information 
@@ -15,7 +15,7 @@ let
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline
     autoconf automake libtool pkgconfig zlib libaio libxml2
-    acl sqlite liburcu attr
+    acl sqlite liburcu attr makeWrapper
   ];
   # Some of the headers reference acl
   propagatedBuildInputs = [
@@ -32,7 +32,7 @@ rec {
     '';
 
   configureFlags = [
-    ''--with-mountutildir="$out/sbin" --localstatedir=/var''
+    ''--localstatedir=/var''
     ];
 
   makeFlags = "DESTDIR=$(out)";
@@ -48,6 +48,7 @@ rec {
   postInstall = ''
     cp -r $out/$out/* $out
     rm -r $out/nix
+    wrapProgram $out/sbin/mount.glusterfs --set PATH "${stdenv.lib.makeBinPath [ coreutils gnused attr gnugrep which]}"
     '';
 
   src = fetchurl {

From 28c06567f8d91528c4f9feca5a7afe7a269b0f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 5 Jan 2017 10:23:58 +0100
Subject: [PATCH 47/90] haskellPackages.hakyll: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 ++-
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4c0cb349860..2d39e68c9a1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -192,7 +192,8 @@ self: super: {
     then dontCheck (overrideCabal super.hakyll (drv: {
       testToolDepends = [];
     }))
-    else super.hakyll;
+    # https://github.com/jaspervdj/hakyll/issues/491
+    else dontCheck super.hakyll;
 
   # Heist's test suite requires system pandoc
   heist = overrideCabal super.heist (drv: {
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 66b0a7f3db7..434e7f51a2c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4075,7 +4075,6 @@ dont-distribute-packages:
   hakyll-sass:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-series:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-shakespeare:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   halberd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   halfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halipeto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]

From 60c88c48d1c91cd5e82e2072a0e9558a96dc2995 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Thu, 5 Jan 2017 11:33:20 +0200
Subject: [PATCH 48/90] dvdplusrwtools: apply multiple fixes

Upstream version of dvd+rw-tools is quite old and many Linux
distributions apply multiple patches to keep it working on newer
systems. This commit includes those patches.

This closes #21024.
---
 pkgs/tools/cd-dvd/dvd+rw-tools/default.nix    | 14 ++-
 .../dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch | 13 +++
 .../dvd+rw-tools-7.0-glibc2.6.90.patch        | 11 +++
 .../dvd+rw-tools-7.0-wctomb.patch             | 11 +++
 .../dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch | 11 +++
 .../dvd+rw-tools-7.1-layerbreaksetup.patch    | 93 +++++++++++++++++++
 6 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch
 create mode 100644 pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch

diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
index ecadcc2b001..40ca08c9260 100644
--- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
@@ -8,12 +8,24 @@ stdenv.mkDerivation {
     sha256 = "1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq";
   };
 
+  # Patches from Gentoo / Fedora
+  # https://bugs.gentoo.org/257360
+  # https://bugzilla.redhat.com/show_bug.cgi?id=426068
+  # https://bugzilla.redhat.com/show_bug.cgi?id=243036
+  patches = [
+    ./dvd+rw-tools-7.0-dvddl.patch
+    ./dvd+rw-tools-7.0-glibc2.6.90.patch
+    ./dvd+rw-tools-7.0-wctomb.patch
+    ./dvd+rw-tools-7.0-wexit.patch
+    ./dvd+rw-tools-7.1-layerbreaksetup.patch
+  ];
+
   buildInputs = [cdrkit m4];
 
   preBuild = ''
     makeFlags="prefix=$out"
   '';
-  
+
   # Incompatibility with Linux 2.6.23 headers, see
   # http://www.mail-archive.com/cdwrite@other.debian.org/msg11464.html
   NIX_CFLAGS_COMPILE = "-DINT_MAX=__INT_MAX__";
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch
new file mode 100644
index 00000000000..c1c6fb3332a
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch
@@ -0,0 +1,13 @@
+--- ./growisofs_mmc.cpp.joe	2006-04-27 20:45:00.788446635 +0200
++++ ./growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
+@@ -1412,9 +1412,7 @@
+     blocks += 15, blocks &= ~15;
+ 
+     if (blocks <= split)
+-	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
+-			"    use single layer media for this recording\n"),
+-	exit (FATAL_START(EMEDIUMTYPE));
++	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
+ 
+     blocks /= 16;
+     blocks += 1;
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch
new file mode 100644
index 00000000000..49742d3c4db
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch
@@ -0,0 +1,11 @@
+diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx
+--- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90	2007-08-15 12:56:17.000000000 +0200
++++ dvd+rw-tools-7.0/transport.hxx	2007-08-15 12:56:42.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch
new file mode 100644
index 00000000000..3d13fc8d273
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch
@@ -0,0 +1,11 @@
+--- ./transport.hxx~	2008-03-25 21:24:47.000000000 -0400
++++ ./transport.hxx	2008-03-25 21:25:36.000000000 -0400
+@@ -116,7 +116,7 @@
+ extern "C" char *plusminus_locale()
+ { static class __plusminus {
+     private:
+-	char str[4];
++	char str[MB_LEN_MAX];
+     public:
+ 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
+ 			    int l = wctomb(str,(wchar_t)(unsigned char)'±');
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch
new file mode 100644
index 00000000000..e7910cbdd7b
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch
@@ -0,0 +1,11 @@
+--- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit	2007-06-21 12:42:30.000000000 +0200
++++ dvd+rw-tools-7.0/dvd+rw-format.cpp	2007-06-21 12:44:13.000000000 +0200
+@@ -245,7 +245,7 @@ int main (int argc, char *argv[])
+ 	alarm(1);
+ 	while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ;
+ 	if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n");
+-	exit (0);
++	exit (WEXITSTATUS(i));
+     }
+ #endif
+ 
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch
new file mode 100644
index 00000000000..7636f8393df
--- /dev/null
+++ b/pkgs/tools/cd-dvd/dvd+rw-tools/dvd+rw-tools-7.1-layerbreaksetup.patch
@@ -0,0 +1,93 @@
+diff -ur dvd+rw-tools-7.1-orig/growisofs.c dvd+rw-tools-7.1/growisofs.c
+--- dvd+rw-tools-7.1-orig/growisofs.c	2008-03-04 10:15:03.000000000 +0100
++++ dvd+rw-tools-7.1/growisofs.c	2009-09-06 22:39:33.000000000 +0200
+@@ -535,7 +535,7 @@
+  */
+ int        get_mmc_profile	(void *fd);
+ int        plusminus_r_C_parm	(void *fd,char *C_parm);
+-pwrite64_t poor_mans_setup	(void *fd,off64_t leadout);
++pwrite64_t poor_mans_setup	(void *fd,off64_t leadout,unsigned int lbreak);
+ char      *plusminus_locale	();
+ int        __1x			();
+ /*
+@@ -2447,7 +2447,7 @@
+ 			    goto out;
+ 			}
+ 			if (!progress.final) progress.final = tracksize;
+-			tracksize = layer_break*CD_BLOCK*2;
++			//tracksize = layer_break*CD_BLOCK*2;
+ 		    }
+ 		}
+ 		else if (capacity > outoff)
+@@ -2648,7 +2648,7 @@
+ 	 * further details on poor_mans_setup
+ 	 */
+ 	pwrite64_method = poor_mans_setup (ioctl_handle,
+-					   outoff+tracksize);
++					   outoff+tracksize, (unsigned int)layer_break);
+     }
+ 
+     if (!progress.final)
+diff -ur dvd+rw-tools-7.1-orig/growisofs_mmc.cpp dvd+rw-tools-7.1/growisofs_mmc.cpp
+--- dvd+rw-tools-7.1-orig/growisofs_mmc.cpp	2008-03-04 18:47:49.000000000 +0100
++++ dvd+rw-tools-7.1/growisofs_mmc.cpp	2009-09-06 20:52:46.000000000 +0200
+@@ -1612,7 +1612,7 @@
+   return 0;
+ }
+ 
+-static void plus_r_dl_split (Scsi_Command &cmd,off64_t size)
++static void plus_r_dl_split (Scsi_Command &cmd,off64_t size,unsigned int lbreak)
+ { int           err;
+   unsigned int  blocks,split;
+   unsigned char dvd_20[4+8];
+@@ -1644,10 +1644,17 @@
+ 			"    use single layer media for this recording\n"),
+ 	exit (FATAL_START(EMEDIUMTYPE));
+ 
+-    blocks /= 16;
+-    blocks += 1;
+-    blocks /= 2;
+-    blocks *= 16;
++    if (lbreak)
++      {
++	blocks=lbreak;
++      }
++    else
++      {
++	blocks /= 16;
++	blocks += 1;
++	blocks /= 2;
++	blocks *= 16;
++      }
+ 
+     fprintf (stderr,"%s: splitting layers at %u blocks\n",
+ 		    ioctl_device,blocks);
+@@ -2010,7 +2017,7 @@
+ typedef ssize_t (*pwrite64_t)(int,const void *,size_t,off64_t);
+ 
+ extern "C"
+-pwrite64_t poor_mans_setup (void *fd,off64_t leadout)
++pwrite64_t poor_mans_setup (void *fd,off64_t leadout,unsigned int lbreak)
+ { Scsi_Command cmd(ioctl_handle=fd);
+   int err,profile=mmc_profile&0xFFFF;
+ 
+@@ -2059,7 +2066,7 @@
+ 	case 0x2B:	// DVD+R Double Layer
+ 	    plusminus_pages_setup(cmd,profile);
+ 	    if (profile==0x2B && next_track==1 && dvd_compat && leadout)
+-		plus_r_dl_split (cmd,leadout);
++	      plus_r_dl_split (cmd,leadout,lbreak);
+ 	    atexit (plus_r_finalize);
+ 	    if (next_wr_addr)
+ 	    {	atsignals (no_r_finalize);
+diff -ur dvd+rw-tools-7.1-orig/transport.hxx dvd+rw-tools-7.1/transport.hxx
+--- dvd+rw-tools-7.1-orig/transport.hxx	2008-03-01 11:34:43.000000000 +0100
++++ dvd+rw-tools-7.1/transport.hxx	2009-09-06 20:53:53.000000000 +0200
+@@ -9,6 +9,7 @@
+ #if defined(__unix) || defined(__unix__)
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/types.h>

From 0be446fbfac7503a5b5cdbe871c6e086b1f9bcae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Jan 2017 10:58:37 +0100
Subject: [PATCH 49/90] pythonPackages.credstash: 1.11.0 -> 1.13.2

---
 pkgs/top-level/python-packages.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9705a4b165e..7855ab2670d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4279,15 +4279,25 @@ in {
   };
 
   credstash = buildPythonPackage rec {
-    name    = "credstash-${version}";
-    version = "1.11.0";
+    pname    = "credstash";
+    version = "1.13.2";
+    name = "${pname}-${version}";
 
     src = pkgs.fetchurl {
-      url    = "https://pypi.python.org/packages/e2/64/6abae87b8da07c262d50b51eed540096ed1f6e01539bf2f2d4c3f718c8c6/credstash-1.11.0.tar.gz";
-      sha256 = "03qm8bjfskzkkmgcy5dr70x9pxabjb3fi0v0nxicg1kryy64k0dz";
+      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+      sha256 = "b6283e565e3e441e8f74efcca54ece9697db16ce2e930fb5b6f7c0ab929c377e";
     };
 
-    propagatedBuildInputs = with self; [ pycrypto boto3 docutils ];
+    propagatedBuildInputs = with self; [ cryptography boto3 pyyaml docutils ];
+
+    # No tests in archive
+    doCheck = false;
+
+    meta = {
+      description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB";
+      homepage = https://github.com/LuminalOSS/credstash;
+      license = licenses.asl20;
+    };
   };
 
   cython = buildPythonPackage rec {

From 3b7193604f8b05dcb08afab8801203825bd966c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 5 Jan 2017 10:59:25 +0100
Subject: [PATCH 50/90] pythonPackages.pycrypto: dummy depending on
 pycryptodome, closes #21671

---
 .../python-modules/pycrypto/default.nix       | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 182a8c6f7fa..e3bd8e2b371 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -1,34 +1,30 @@
-{ stdenv, fetchurl, fetchpatch, python, buildPythonPackage, gmp }:
+{ stdenv, fetchurl, buildPythonPackage, pycryptodome }:
 
-buildPythonPackage rec {
-  name = "pycrypto-2.6.1";
-  namePrefix = "";
+# This is a dummy package providing the drop-in replacement pycryptodome.
+# https://github.com/NixOS/nixpkgs/issues/21671
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pycrypto/${name}.tar.gz";
-    sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
-  };
+let
+  version = pycryptodome.version;
+  pname = "pycrypto";
+in buildPythonPackage rec {
+  name = "${pname}-${version}";
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2013-7459.patch";
-      url = "https://anonscm.debian.org/cgit/collab-maint/python-crypto.git/plain/debian/patches/CVE-2013-7459.patch?h=debian/2.6.1-7";
-      sha256 = "01r7aghnchc1bpxgdv58qyi2085gh34bxini973xhy3ks7fq3ir9";
-    })
-  ];
+  # Cannot build wheel otherwise (zip 1980 issue)
+  SOURCE_DATE_EPOCH=315532800;
 
-  preConfigure = ''
-    sed -i 's,/usr/include,/no-such-dir,' configure
-    sed -i "s!,'/usr/include/'!!" setup.py
+  # We need to have a dist-info folder, so let's create one with setuptools
+  unpackPhase = ''
+    echo "from setuptools import setup; setup(name='${pname}', version='${version}', install_requires=['pycryptodome'])" > setup.py
   '';
 
-  buildInputs = stdenv.lib.optional (!python.isPypy or false) gmp; # optional for pypy
+  propagatedBuildInputs = [ pycryptodome ];
 
-  doCheck = !(python.isPypy or stdenv.isDarwin); # error: AF_UNIX path too long
+  # Our dummy has no tests
+  doCheck = false;
 
   meta = {
     homepage = "http://www.pycrypto.org/";
     description = "Python Cryptography Toolkit";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = pycryptodome.meta.platforms;
   };
 }

From 52a7b6549f1afef7c20cf1dfdb113d26b7fd2d6f Mon Sep 17 00:00:00 2001
From: jgertm <jger.tm@gmail.com>
Date: Thu, 5 Jan 2017 11:21:06 +0100
Subject: [PATCH 51/90] bitbucket-server-cli: init at 0.7.0 (#21616)

---
 lib/maintainers.nix                           |  1 +
 .../bitbucket-server-cli/Gemfile              |  2 +
 .../bitbucket-server-cli/Gemfile.lock         | 27 ++++++++
 .../bitbucket-server-cli/default.nix          | 21 ++++++
 .../bitbucket-server-cli/gemset.nix           | 66 +++++++++++++++++++
 .../git-and-tools/default.nix                 |  2 +
 6 files changed, 119 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
 create mode 100644 pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
 create mode 100644 pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
 create mode 100644 pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4cbedd7be03..721e63cd6a7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -214,6 +214,7 @@
   jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
   jfb = "James Felix Black <james@yamtime.com>";
   jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
+  jgertm = "Tim Jaeger <jger.tm@gmail.com>";
   jgillich = "Jakob Gillich <jakob@gillich.me>";
   jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
   joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
new file mode 100644
index 00000000000..8ed32515471
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'atlassian-stash'
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
new file mode 100644
index 00000000000..61159eb3ee9
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock
@@ -0,0 +1,27 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    atlassian-stash (0.7.0)
+      commander (~> 4.1.2)
+      git (>= 1.2.5)
+      json (>= 1.7.5)
+      launchy (~> 2.4.2)
+    commander (4.1.6)
+      highline (~> 1.6.11)
+    git (1.3.0)
+    highline (1.6.21)
+    json (2.0.2)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    public_suffix (2.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  atlassian-stash
+
+BUNDLED WITH
+   1.13.6
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
new file mode 100644
index 00000000000..a3cf434360b
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix
@@ -0,0 +1,21 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv rec {
+  name = "bitbucket-server-cli-${version}";
+
+  version = (import gemset).atlassian-stash.version;
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  pname = "atlassian-stash";
+
+  meta = with lib; {
+    description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)";
+    homepage    = https://bitbucket.org/atlassian/bitbucket-server-cli;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ jgertm ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
new file mode 100644
index 00000000000..a7c1406665e
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix
@@ -0,0 +1,66 @@
+{
+  addressable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
+      type = "gem";
+    };
+    version = "2.5.0";
+  };
+  atlassian-stash = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rsf9h5w5wiglwv0fqwp45fq06fxbg68cqkc3bpqvps1i1qm0p6i";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
+  commander = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x9i8hf083wjlgj09nl1p9j8sr5g7amq0fdmxjqs4cxdbg3wpmsb";
+      type = "gem";
+    };
+    version = "4.1.6";
+  };
+  git = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+      type = "gem";
+    };
+    version = "1.6.21";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0";
+      type = "gem";
+    };
+    version = "2.0.2";
+  };
+  launchy = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
+      type = "gem";
+    };
+    version = "2.4.3";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
+      type = "gem";
+    };
+    version = "2.0.5";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 92d41b2b31a..e8c7c3bfbfd 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -22,6 +22,8 @@ in
 rec {
   # Try to keep this generally alphabetized
 
+  bitbucket-server-cli = callPackage ./bitbucket-server-cli { };
+
   darcsToGit = callPackage ./darcs-to-git { };
 
   diff-so-fancy = callPackage ./diff-so-fancy { };

From 1ba9a3cd9bc745f76ea79928e02687105cb38dd0 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 5 Jan 2017 03:59:24 +0100
Subject: [PATCH 52/90] wireguard: 0.0.20161230 -> 0.0.20170105

Version bump that contains some new tools.

fixes #21666
---
 pkgs/os-specific/linux/wireguard/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index c8169c52e80..489d6ac8bc6 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, libmnl, kernel ? null }:
 
-# module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements
-assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";
+# module requires Linux >= 3.18 https://www.wireguard.io/install/#kernel-requirements
+assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
 
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20161230";
+  version = "0.0.20170105";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "15p3k8msk3agr0i96k12y5h4fxv0gc8zqjk15mizd3wwmw6pgjb9";
+    sha256 = "15iqb1a85aygbf3myw6r79i5h3vpjam1rs6xrnf5kgvgmvp91n8v";
   };
 
   meta = with stdenv.lib; {
@@ -46,6 +46,9 @@ let
     buildInputs = [ libmnl ];
 
     makeFlags = [
+      "WITH_BASHCOMPLETION=yes"
+      "WITH_WGQUICK=yes"
+      "WITH_SYSTEMDUNITS=yes"
       "DESTDIR=$(out)"
       "PREFIX=/"
       "-C" "tools"

From 0b22e6254b11833dcd96370ee020940011921d42 Mon Sep 17 00:00:00 2001
From: nzupec <zupec.nejc@gmail.com>
Date: Thu, 5 Jan 2017 15:48:49 +0100
Subject: [PATCH 53/90] libmemcached: update sha256 hash

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

diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix
index 2570c645f26..a0e3bb52dfe 100644
--- a/pkgs/development/libraries/libmemcached/default.nix
+++ b/pkgs/development/libraries/libmemcached/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
     ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
       url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb";
-      sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb";
+      sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8";
     });
 
   buildInputs = [ libevent ];

From 2102fa0d6d8a4e79498c8ad9b5a97fb2015c68b7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 5 Jan 2017 07:25:29 +0100
Subject: [PATCH 54/90] smack: 3.4.1 -> 4.1.9, fixe CVE-2016-10027

cc #21642
---
 pkgs/development/libraries/java/smack/builder.sh  | 2 +-
 pkgs/development/libraries/java/smack/default.nix | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/java/smack/builder.sh b/pkgs/development/libraries/java/smack/builder.sh
index 83edfe04a65..c97259e6a17 100644
--- a/pkgs/development/libraries/java/smack/builder.sh
+++ b/pkgs/development/libraries/java/smack/builder.sh
@@ -4,4 +4,4 @@ mkdir smack
 cd smack
 tar xfvz $src
 mkdir -p $out/share/java
-cp smack-*.jar $out/share/java
+cp libs/smack-*.jar $out/share/java
diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix
index 081bcccdd7d..c39478e590d 100644
--- a/pkgs/development/libraries/java/smack/default.nix
+++ b/pkgs/development/libraries/java/smack/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "smack-3.4.1";
+  name = "smack-4.1.9";
   builder = ./builder.sh;
-  
+
   src = fetchurl {
-    url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_4_1.tar.gz;
-    sha256 = "13jm93b0dsfxr62brq1hagi9fqk7ip3pi80svq10zh5kcpk77jf4";
+    url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz;
+    sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp";
   };
 
   meta = {

From c58ac7e4d6f82e968bcb3bc05ca8af107294d3a5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 5 Jan 2017 17:23:25 +0100
Subject: [PATCH 55/90] irssi: 0.8.20 -> 0.8.21 (security)

Fixes four security vulnerabilities:

  https://irssi.org/security/irssi_sa_2017_01.txt

No CVEs were assigned yet at the time of this commit.

cc #21642
---
 pkgs/applications/networking/irc/irssi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 5fd45368536..0d2dcd3b45a 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.8.20";
+  version = "0.8.21";
   name = "irssi-${version}";
 
   src = fetchurl {
     urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ];
-    sha256 = "0riz2wsdcs5hx5rwynm99fi01973lfrss21y8qy30dw2m9v0zqpm";
+    sha256 = "0fxacadhdzl3n0231mqjv2gcmj1fj85azhbbsk0fq7xmf1da7ha2";
   };
 
   buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];

From c3f3e566972fa28fe04e14d79b724279ebf21acf Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 5 Jan 2017 18:07:22 +0100
Subject: [PATCH 56/90] dictd-db: Add deu2eng / eng2deu

---
 pkgs/servers/dict/dictd-db.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 500ac6fd47b..70cd362c5ea 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -28,6 +28,14 @@ let
      };
    };
 in rec {
+  deu2eng = makeDictdDBFreedict (fetchurl {
+    url = http://prdownloads.sourceforge.net/freedict/deu-eng.tar.gz;
+    sha256 = "0dqrhv04g4f5s84nbgisgcfwk5x0rpincif0yfhfh4sc1bsvzsrb";
+  }) "deu-eng" "de_DE";
+  eng2deu = makeDictdDBFreedict (fetchurl {
+    url = http://prdownloads.sourceforge.net/freedict/eng-deu.tar.gz;
+    sha256 = "01x12p72sa3071iff3jhzga8588440f07zr56r3x98bspvdlz73r";
+  }) "eng-deu" "en_EN";
   nld2eng = makeDictdDBFreedict (fetchurl {
     url = http://prdownloads.sourceforge.net/freedict/nld-eng.tar.gz;
     sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07";

From 9bb6d91c73b33d466a7da3aed7767eca12f227c6 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 5 Jan 2017 17:37:33 +0000
Subject: [PATCH 57/90] httpd: setuptools is not top-level

---
 nixos/modules/services/web-servers/apache-httpd/trac.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index 87ed36e3530..35b9ab56087 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -99,7 +99,7 @@ in
         makeSearchPathOutput "lib" "lib/${pkgs.python.libPrefix}/site-packages"
           [ pkgs.mod_python
             pkgs.pythonPackages.trac
-            pkgs.setuptools
+            pkgs.pythonPackages.setuptools
             pkgs.pythonPackages.genshi
             pkgs.pythonPackages.psycopg2
             subversion

From 1181bdd7175a5e2e137dd5f33336a6826b91a468 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 5 Jan 2017 16:46:37 +0000
Subject: [PATCH 58/90] chromium, google-chrome: add commandLineArgs

---
 pkgs/applications/networking/browsers/chromium/default.nix   | 2 ++
 .../networking/browsers/google-chrome/default.nix            | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 1556603db2c..d014999a667 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -12,6 +12,7 @@
 , enableWideVine ? false
 , cupsSupport ? true
 , pulseSupport ? false
+, commandLineArgs ? ""
 }:
 
 let
@@ -76,6 +77,7 @@ in stdenv.mkDerivation {
     mkdir -p "$out/bin"
 
     eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
+      ${commandLineArgs} \
       ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
 
     ed -v -s "$out/bin/chromium" << EOF
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 938dbe09ebe..abc314f8569 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -6,6 +6,9 @@
 , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
 , dbus_libs, gtk2, gdk_pixbuf, gcc
 
+# command line arguments which are always set e.g "--disable-gpu"
+, commandLineArgs ? ""
+
 # Will crash without.
 , systemd
 
@@ -106,7 +109,7 @@ in stdenv.mkDerivation rec {
     #!${bash}/bin/sh
     export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
     export PATH=$binpath\''${PATH:+:\$PATH}
-    $out/share/google/$appname/google-$appname "\$@"
+    $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@"
     EOF
     chmod +x $exe
 

From bae778e86c7a946870844c644def9e0f89b2f68d Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 5 Jan 2017 13:33:49 -0800
Subject: [PATCH 59/90] pythonPackages.pyev: Fix expression to work on Darwin

---
 pkgs/top-level/python-packages.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7855ab2670d..e407a27d990 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20067,11 +20067,18 @@ in {
 
     buildInputs = [ pkgs.libev ];
 
-    postPatch = ''
-      libev_so=${pkgs.libev}/lib/libev.so.4
-      test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
-      sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
-    '';
+    postPatch =
+      if !stdenv.isDarwin 
+      then ''
+        libev_so=${pkgs.libev}/lib/libev.so.4
+        test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
+        sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
+      ''
+      else ''
+        libev_so=${pkgs.libev}/lib/libev.4.dylib
+        test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
+        sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
+      '';
 
     meta = {
       description = "Python bindings for libev";

From 52e74ddc628877ac06f653a5d81905392a3a805f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 5 Jan 2017 13:36:29 -0800
Subject: [PATCH 60/90] pythonPackages.pyev: Remove duplication from last
 commit

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e407a27d990..cfff12c79ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20067,18 +20067,15 @@ in {
 
     buildInputs = [ pkgs.libev ];
 
-    postPatch =
-      if !stdenv.isDarwin 
-      then ''
-        libev_so=${pkgs.libev}/lib/libev.so.4
-        test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
-        sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
-      ''
-      else ''
-        libev_so=${pkgs.libev}/lib/libev.4.dylib
-        test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
-        sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
-      '';
+    libEvSharedLibrary = 
+      if !stdenv.isDarwin  
+      then "${pkgs.libev}/lib/libev.so.4"
+      else "${pkgs.libev}/lib/libev.4.dylib";
+
+    postPatch = ''
+      test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; }
+      sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py
+    '';
 
     meta = {
       description = "Python bindings for libev";

From 92be17aef4712e453ad86dd756707ce21bc13936 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 5 Jan 2017 15:52:34 -0600
Subject: [PATCH 61/90] discord: paxmark to fix execution

---
 .../networking/instant-messengers/discord/default.nix           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 8387d2f7c38..57ef7250f46 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
                  --set-rpath "$out:$libPath"                                   \
                  $out/DiscordCanary
 
+        paxmark m $out/DiscordCanary
+
         ln -s $out/DiscordCanary $out/bin/
         ln -s $out/discord.png $out/share/pixmaps
 

From 4e847427983e3980e8d1819ae611c103836f1387 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 5 Jan 2017 16:13:31 -0600
Subject: [PATCH 62/90] discord: 0.0.11 -> 0.0.13

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 57ef7250f46..1d1ae151caa 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
 
     pname = "discord";
-    version = "0.0.11";
+    version = "0.0.13";
     name = "${pname}-${version}";
 
     src = fetchurl {
         url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz";
-        sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18";
+        sha256 = "1pwb8y80z1bmfln5wd1vrhras0xygd1j15sib0g9vaig4mc55cs6";
     };
 
     libPath = stdenv.lib.makeLibraryPath [

From 8d029efdfde39dae8456fe20e25c77ac80ba53ce Mon Sep 17 00:00:00 2001
From: Yannis Koutras <ioannis.koutras@gmail.com>
Date: Fri, 6 Jan 2017 00:20:36 +0200
Subject: [PATCH 63/90] skrooge: 2.5.0 -> 2.6.0 (#21690)

---
 pkgs/applications/office/skrooge/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix
index 6751e7d6d11..98c1c4c8b79 100644
--- a/pkgs/applications/office/skrooge/2.nix
+++ b/pkgs/applications/office/skrooge/2.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "03ayrrr7rrj1jl1qh3sgn56hbi44wn4ldgcj08b93mqw7wdvpglp";
+    sha256 = "13sd669rx66fpk9pm72nr2y69k2h4mcs4b904i9xm41i0fiy6szp";
   };
 
   nativeBuildInputs = [ cmake ecm makeQtWrapper ];

From 1a80edba7d3500af4eadc2eacac56b84bd4e1a1f Mon Sep 17 00:00:00 2001
From: Nahum Shalman <nshalman@omniti.com>
Date: Thu, 5 Jan 2017 17:34:25 -0500
Subject: [PATCH 64/90] shfmt: 0.2.0 -> 1.1.0

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

diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index cac9bbb168b..7328cd3878a 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "shfmt-${version}";
-  version = "0.2.0";
+  version = "1.1.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/mvdan/sh";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "mvdan";
     repo = "sh";
     inherit rev;
-    sha256 = "07jf9v6583vvmk07fp7xdlnh7rvgl6f06ib2588g3xf1wk9vrq3d";
+    sha256 = "0h1qy27z6j1cgkk3hkvl7w3wjqc5flgn92r3j6frn8k2wzwj7zhz";
   };
 
   meta = with stdenv.lib; {

From 8ca70e358d8836c66153e85db2aee4a0fd44fd21 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Wed, 4 Jan 2017 16:25:59 -0500
Subject: [PATCH 65/90] mu: allow gtk-free builds

The gtk components are enabled by default when stdenv.isLinux is true.
---
 pkgs/tools/networking/mu/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 0cd3e15e762..c82588559df 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,6 +1,7 @@
 { fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook
 , xapian, glib, gmime, texinfo , emacs, guile
-, gtk3, webkitgtk24x, libsoup, icu }:
+, gtk3, webkitgtk24x, libsoup, icu
+, withMug ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
   version = "0.9.18";
@@ -13,8 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu
-    autoreconfHook
-    gtk3 webkitgtk24x ];
+    autoreconfHook ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
 
   preBuild = ''
     # Fix mu4e-builddir (set it to $out)
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   # Install mug and msg2pdf
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString withMug ''
     cp -v toys/msg2pdf/msg2pdf $out/bin/
     cp -v toys/mug/mug $out/bin/
   '';

From 196eb75b88b79718b84b8a936eb7313bc7d4a495 Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Thu, 5 Jan 2017 16:20:45 -0800
Subject: [PATCH 66/90] transcrypt: 1.0.0 -> 1.0.1

---
 .../version-management/git-and-tools/transcrypt/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index 44a00238a5c..36d81ae9c44 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "transcrypt-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "elasticdog";
     repo = "transcrypt";
     rev = "v${version}";
-    sha256 = "195hi8lq1i9rfcwj3raw4pa7fhvv3ghznxp4crmbjm7c0sqilcpd";
+    sha256 = "12n8714my9i93lysqa3dj1z5xgi10iv5y1mnsqki9zn5av3lgqkq";
   };
 
   buildInputs = [ git makeWrapper openssl ];

From f2502c9d869524bf76eb58b6e68573bf45b45e66 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Jan 2017 19:48:25 -0500
Subject: [PATCH 67/90] atom: 1.12.8 -> 1.12.9

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 366233d451f..51d2f26eb0d 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.12.8";
+  version = "1.12.9";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1kxydw8pzz2c55vl2fzn6dnfkqcr1hkx55k10g7z86afmc7g9vxv";
+    sha256 = "1yp4wwv0vxsad7jqkn2rj4n7k2ccgqscs89p3j6z8vpm6as0i6sg";
     name = "${name}.deb";
   };
 

From 7115ed67837cdcc1fa98f0e34c066f5392c16007 Mon Sep 17 00:00:00 2001
From: spy-tech <spy-tech@users.noreply.github.com>
Date: Tue, 3 Jan 2017 14:12:45 +0100
Subject: [PATCH 68/90] awscli: 1.11.30 -> 1.11.35

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfff12c79ea..49a1e91e278 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1509,13 +1509,11 @@ in {
 
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
-    version = "1.11.30";
-
-    namePrefix = "";
-
-    src = pkgs.fetchurl {
+    version = "1.11.35";
+      namePrefix = "";
+      src = pkgs.fetchurl {
       url = "mirror://pypi/a/awscli/${name}.tar.gz";
-      sha256 = "07km02wnjbaf745cs8j6zlwk9c2561l82zvr23a6d3qzs8wwxicf";
+      sha256 = "0k6y8cg311bqak5x9pilg80w6f76dcbzm6xcdrw6rjnk6v4xwy70";
     };
 
     # No tests included
@@ -3074,12 +3072,11 @@ in {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.4.87"; # This version is required by awscli
+    version = "1.4.92"; # This version is required by awscli
     name = "botocore-${version}";
-
     src = pkgs.fetchurl {
       url = "mirror://pypi/b/botocore/${name}.tar.gz";
-      sha256 = "0fga1zjffsn2h50hbw7s4lcv6zwz5dcjgvjncl5y392mhivlrika";
+      sha256 = "08rpsfqd2g4iqvi1id8yhmyz2mc299dnr4aikkwjm24rih75p9aj";
     };
 
     propagatedBuildInputs =

From 62e4cfa88783cffb384838a52a41d7b7c7cbbde3 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 5 Jan 2017 19:53:47 -0800
Subject: [PATCH 69/90] matrix-synapse: 0.18.6-rc2 -> 0.18.6-rc3

---
 pkgs/servers/matrix-synapse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 7eac25afd78..ddbf35be83c 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -24,13 +24,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.18.6-rc2";
+  version = "0.18.6-rc3";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0alsby8hghhzgpzism2f9v5pmz91v20bd18nflfka79f3ss03h0q";
+    sha256 = "1a2yj22s84sd3nm9lx4rcdjbpbfclz6cp0ljpilw6n7spmj1nhcd";
   };
 
   patches = [ ./matrix-synapse.patch ];

From f133475370d9f1e258b5cfd2602185e5213c3027 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Mon, 14 Sep 2015 08:44:00 +1000
Subject: [PATCH 70/90] natron: init at 2.1.9

---
 pkgs/applications/video/natron/config.pri  |  20 ++++
 pkgs/applications/video/natron/default.nix | 126 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   2 +
 3 files changed, 148 insertions(+)
 create mode 100644 pkgs/applications/video/natron/config.pri
 create mode 100644 pkgs/applications/video/natron/default.nix

diff --git a/pkgs/applications/video/natron/config.pri b/pkgs/applications/video/natron/config.pri
new file mode 100644
index 00000000000..c0d236c6b97
--- /dev/null
+++ b/pkgs/applications/video/natron/config.pri
@@ -0,0 +1,20 @@
+boost: LIBS += -lboost_serialization
+expat: LIBS += -lexpat
+expat: PKGCONFIG -= expat
+cairo {
+        PKGCONFIG += cairo
+        LIBS -=  $$system(pkg-config --variable=libdir cairo)/libcairo.a
+}
+pyside {
+        PKGCONFIG -= pyside
+        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)
+        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtCore
+        INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtGui
+        INCLUDEPATH += $$system(pkg-config --variable=includedir QtGui)
+        LIBS += -lpyside-python2.7
+}
+shiboken {
+        PKGCONFIG -= shiboken
+        INCLUDEPATH += $$system(pkg-config --variable=includedir shiboken)
+        LIBS += -lshiboken-python2.7
+}
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
new file mode 100644
index 00000000000..75dccbafd3f
--- /dev/null
+++ b/pkgs/applications/video/natron/default.nix
@@ -0,0 +1,126 @@
+{ lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages,
+  cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
+  poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio,
+  qmake4Hook, libpng, mesa_noglu, lndir }:
+
+let
+  minorVersion = "2.1";
+  version = "${minorVersion}.9";
+  OpenColorIO-Configs = fetchurl {
+    url = "https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v${minorVersion}.tar.gz";
+    sha256 = "9eec5a02ca80c9cd8e751013cb347ea982fdddd592a4a9215cce462e332dac51";
+  };
+  seexpr = stdenv.mkDerivation rec {
+    version = "1.0.1";
+    name = "seexpr-${version}";
+    src = fetchurl {
+      url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz";
+      sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp";
+    };
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ libpng flex bison ];
+  };
+  buildPlugin = { pluginName, sha256, buildInputs, preConfigure ? "" }:
+    stdenv.mkDerivation {
+      name = "openfx-${pluginName}-${version}";
+      src = fetchurl {
+        url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz";
+        inherit sha256;
+      };
+      inherit buildInputs;
+      preConfigure = ''
+        makeFlagsArray+=("CONFIG=release")
+        makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron")
+        ${preConfigure}
+      '';
+    };
+  lodepngcpp = fetchurl {
+    url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.cpp;
+    sha256 = "1dxkkr4jbmvlwfr7m16i1mgcj1pqxg9s1a7y3aavs9rrk0ki8ys2";
+  };
+  lodepngh = fetchurl {
+    url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h;
+    sha256 = "14drdikd0vws3wwpyqq7zzm5z3kg98svv4q4w0hr45q6zh6hs0bq";
+  };
+  CImgh = fetchurl {
+    url = https://raw.githubusercontent.com/dtschump/CImg/572c12d82b2f59ece21be8f52645c38f1dd407e6/CImg.h;
+    sha256 = "0n4qfxj8j6rmj4svf68gg2pzg8d1pb74bnphidnf8i2paj6lwniz";
+  };
+  plugins = map buildPlugin [
+    ({
+      pluginName = "arena";
+      sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf";
+      buildInputs = [
+        pkgconfig pango librsvg librevenge libcdr opencolorio libxml2 libzip
+        poppler imagemagick
+      ];
+      preConfigure = ''
+        sed -i 's|pkg-config poppler-glib|pkg-config poppler poppler-glib|g' Makefile.master
+        for i in Extra Bundle; do
+          cp ${lodepngcpp} $i/lodepng.cpp
+          cp ${lodepngh} $i/lodepng.h
+        done
+      '';
+    })
+    ({
+      pluginName = "io";
+      sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
+      buildInputs = [
+        pkgconfig libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
+        seexpr
+      ];
+    })
+    ({
+      pluginName = "misc";
+      sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi";
+      buildInputs = [
+        mesa_noglu
+      ];
+      preConfigure = ''
+        cp ${CImgh} CImg/CImg.h
+      '';
+    })
+  ];
+in
+stdenv.mkDerivation {
+  inherit version;
+  name = "natron-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/MrKepzie/Natron/releases/download/${version}/Natron-${version}.tar.xz";
+    sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp";
+  };
+
+  buildInputs = [
+    pkgconfig qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
+  ];
+
+  nativeBuildInputs = [ qmake4Hook python2Packages.wrapPython ];
+
+  preConfigure = ''
+    export MAKEFLAGS=-j$NIX_BUILD_CORES
+    cp ${./config.pri} config.pri
+    mkdir OpenColorIO-Configs
+    tar -xf ${OpenColorIO-Configs} --strip-components=1 -C OpenColorIO-Configs
+  '';
+
+  postFixup = ''
+    for i in ${lib.escapeShellArgs plugins}; do
+      ${lndir}/bin/lndir $i $out
+    done
+    wrapProgram $out/bin/Natron \
+      --set PYTHONPATH "$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Node-graph based, open-source compositing software";
+    longDescription = ''
+      Node-graph based, open-source compositing software. Similar in
+      functionalities to Adobe After Effects and Nuke by The Foundry.
+    '';
+    homepage = https://natron.inria.fr/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ maintainers.puffnfresh ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95b8baf7be2..9c932a27266 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14073,6 +14073,8 @@ in
 
   neomutt = callPackage ../applications/networking/mailreaders/neomutt { };
 
+  natron = callPackage ../applications/video/natron { };
+
   notion = callPackage ../applications/window-managers/notion { };
 
   openshift = callPackage ../applications/networking/cluster/openshift { };

From 8f22697c624b06410471c562450dbc873077964c Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Thu, 5 Jan 2017 21:46:33 -0800
Subject: [PATCH 71/90] darktable 2.2.0 -> 2.2.1

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index ea5113246ba..7213ddcc366 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "2.2.0";
+  version = "2.2.1";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "3eca193831faae58200bb1cb6ef29e658bce43a81706b54420953a7c33d79377";
+    sha256 = "da843190f08e02df19ccbc02b9d1bef6bd242b81499494c7da2cccdc520e24fc";
   };
 
   buildInputs =
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable"
     )
   '';
-  
+
   meta = with stdenv.lib; {
     description = "Virtual lighttable and darkroom for photographers";
     homepage = https://www.darktable.org;

From ad507954fa0401b12131fe7f0461791fdd0e688e Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 6 Jan 2017 09:43:52 +0100
Subject: [PATCH 72/90] emscriptenfastcomp-wrapped: disable hardening

The hardening flags break webassembly generation, at least in some
cases.
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f07b69fb81..86f5abc7fb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1546,7 +1546,10 @@ in
   emscripten = callPackage ../development/compilers/emscripten { };
 
   emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { };
-  emscriptenfastcomp-wrapped = wrapCC emscriptenfastcomp-unwrapped;
+  emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc ''
+    # hardening flags break WASM support
+    cat > $out/nix-support/add-hardening.sh
+  '' emscriptenfastcomp-unwrapped;
   emscriptenfastcomp = symlinkJoin {
     name = "emscriptenfastcomp";
     paths = [ emscriptenfastcomp-wrapped emscriptenfastcomp-unwrapped ];

From d65be2eb12f3f890ac6b615da3b12522da00fa66 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@aubble.com>
Date: Fri, 6 Jan 2017 04:27:35 -0500
Subject: [PATCH 73/90] fzf: install manpage

Closes #21706
---
 pkgs/tools/misc/fzf/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 24c10c241f2..da5817c8850 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -14,6 +14,8 @@ buildGoPackage rec {
     sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l";
   };
 
+  outputs = [ "bin" "out" "man" ];
+
   buildInputs = [ ncurses ];
 
   goDeps = ./deps.nix;
@@ -25,6 +27,8 @@ buildGoPackage rec {
 
   postInstall = ''
     cp $src/bin/fzf-tmux $bin/bin
+    mkdir -p $man/share/man
+    cp -r $src/man/man1 $man/share/man
     mkdir -p $out/share/vim-plugins
     ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
   '';

From ac9b3d64cefae3cff8e90fa0dc6016211a011408 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Wed, 14 Dec 2016 11:18:53 -0800
Subject: [PATCH 74/90] configuration-hackage2nix.yaml: update jb55's packages

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 434e7f51a2c..2c387712592 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3416,8 +3416,6 @@ dont-distribute-packages:
   electrum-mnemonic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  elm-export-persistent:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  elm-export:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   elocrypt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]

From a0c197102e7e3dde5d03ce2678db63c8fddf1831 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Jan 2017 02:08:54 +0100
Subject: [PATCH 75/90] configuration-hackage2nix.yaml: keep aeson 1.0.x around
 for stack

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2c387712592..4b24f4f5312 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2010,6 +2010,7 @@ default-package-overrides:
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 6.12.3
+  - aeson < 1.1                         # required by stack
   - aeson-pretty < 0.8                  # required by elm compiler
   - binary > 0.7 && < 0.8               # binary 0.8.x is the latest, but it's largely unsupported so far
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions

From 0761b0bc5b8d8c579fa929a698c584a2e67431f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jan 2017 09:38:14 +0100
Subject: [PATCH 76/90] configuration-hackage2nix.yaml: don't follow LTS
 Haskell's version constraints on hledger-*

---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4b24f4f5312..97d6bc5695e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -855,9 +855,6 @@ default-package-overrides:
   - hjsmin ==0.2.0.2
   - hjsonpointer ==1.0.0.2
   - hjsonschema ==1.1.0.1
-  - hledger ==1.0.1
-  - hledger-interest ==1.5.1
-  - hledger-lib ==1.0.1
   - hlibgit2 ==0.18.0.15
   - hlibsass ==0.1.5.0
   - hlint ==1.9.35

From d2e344616c46260cada31b22508004b798e96d22 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Dec 2016 17:34:49 +0100
Subject: [PATCH 77/90] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-7-g48fad11 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c6ccb9817117572abc2711b4208b507ff75bde8b.
---
 .../haskell-modules/hackage-packages.nix      | 2633 ++++++++++++++---
 1 file changed, 2143 insertions(+), 490 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 641968a4d39..2528b8a8bef 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1393,13 +1393,13 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.0.1";
-       sha256 = "b20fbbd9e38b9f764a9152aa123bbf7296b4be361bddfc7e1bbe833d439f9c20";
+       version = "1.0.3";
+       sha256 = "88963139ccce5e5ab1125bf590847d403d08a9b9f17f91a4fcb704a6881f6335";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
        ];
-       description = "Libary containing parsing and visualisation functions and datastructures for Hidden Markov Models in HMMER3 format";
+       description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -6199,6 +6199,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Glob_0_7_14" = callPackage
+    ({ mkDerivation, base, containers, directory, dlist, filepath
+     , HUnit, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "Glob";
+       version = "0.7.14";
+       sha256 = "2837b88916e8ba4314fdbb556de8b0e7f577b848d3e80a08959b6ef47e1c842b";
+       libraryHaskellDepends = [
+         base containers directory dlist filepath transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers directory dlist filepath HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+         transformers transformers-compat
+       ];
+       homepage = "http://iki.fi/matti.niemenmaa/glob/";
+       description = "Globbing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GlomeTrace" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -8125,6 +8149,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HTTP_4000_3_4" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
+     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
+     , network, network-uri, parsec, pureMD5, split, test-framework
+     , test-framework-hunit, time, wai, warp
+     }:
+     mkDerivation {
+       pname = "HTTP";
+       version = "4000.3.4";
+       sha256 = "a4066d6fe45fa41d1c3e262e1100c740dc35cddec34c576723bdc35a8dcfc322";
+       libraryHaskellDepends = [
+         array base bytestring mtl network network-uri parsec time
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive conduit conduit-extra deepseq
+         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
+         test-framework test-framework-hunit wai warp
+       ];
+       homepage = "https://github.com/haskell/HTTP";
+       description = "A library for client-side HTTP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HTTP-Simple" = callPackage
     ({ mkDerivation, base, HTTP, network }:
      mkDerivation {
@@ -10712,8 +10760,8 @@ self: {
      }:
      mkDerivation {
        pname = "Lazy-Pbkdf2";
-       version = "2.1.1";
-       sha256 = "a79a0282997dfc4905314bded417f7631c6665802c9fa5103aad999e1832daa9";
+       version = "2.1.2";
+       sha256 = "8a39397ba2756a1a3a7a7802e5d4cb824377289acb8c21aec37a76494daba1a3";
        libraryHaskellDepends = [ base binary bytestring ];
        testHaskellDepends = [
          base base16-bytestring binary bytestring cryptonite memory
@@ -11734,6 +11782,22 @@ self: {
        license = "unknown";
      }) {};
 
+  "MonadRandom_0_5" = callPackage
+    ({ mkDerivation, base, fail, mtl, primitive, random, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "MonadRandom";
+       version = "0.5";
+       sha256 = "e239800faed1142b348d1125232ee1266209865ff6aa09516d4d516bec88c3dc";
+       libraryHaskellDepends = [
+         base fail mtl primitive random transformers transformers-compat
+       ];
+       description = "Random-number generation monad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "MonadRandomLazy" = callPackage
     ({ mkDerivation, base, MonadRandom, mtl, random }:
      mkDerivation {
@@ -14278,22 +14342,22 @@ self: {
     ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP
      , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers
      , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
-     , hierarchical-clustering, HTTP, http-conduit, hxt, matrix, network
-     , parsec, process, pureMD5, random, split, Taxonomy, text, time
-     , transformers, vector, ViennaRNAParser
+     , hierarchical-clustering, HTTP, http-conduit, http-types, hxt
+     , matrix, network, parsec, process, pureMD5, random, split
+     , Taxonomy, text, time, transformers, vector, ViennaRNAParser
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.2.6";
-       sha256 = "a3a0de2cde3813f9e7f87f27f8ebf306bcb6da8da6b818624a335c329e051874";
+       version = "1.2.8";
+       sha256 = "f4d754abee29eebb424ffb6d498de24544de1895a5ace4e47863870f62d2b94a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base biocore biofasta BlastHTTP blastxml bytestring cassava
          ClustalParser cmdargs containers directory edit-distance
          either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP
-         http-conduit hxt matrix network parsec process pureMD5 random
-         Taxonomy text transformers vector ViennaRNAParser
+         http-conduit http-types hxt matrix network parsec process pureMD5
+         random Taxonomy text transformers vector ViennaRNAParser
        ];
        executableHaskellDepends = [
          base biocore biofasta bytestring cassava cmdargs containers
@@ -20114,6 +20178,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson_1_1_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, base-orphans
+     , base16-bytestring, bytestring, containers, deepseq, directory
+     , dlist, filepath, generic-deriving, ghc-prim, hashable
+     , hashable-time, HUnit, QuickCheck, quickcheck-instances
+     , scientific, tagged, template-haskell, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , time-locale-compat, unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "1.1.0.0";
+       sha256 = "5810fc5f664855ba6457d119fffd176ee93e60a27e88f5eedc349d7d75f18880";
+       libraryHaskellDepends = [
+         attoparsec base base-compat bytestring containers deepseq dlist
+         ghc-prim hashable scientific tagged template-haskell text time
+         time-locale-compat unordered-containers uuid-types vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat base-orphans base16-bytestring
+         bytestring containers directory dlist filepath generic-deriving
+         ghc-prim hashable hashable-time HUnit QuickCheck
+         quickcheck-instances scientific tagged template-haskell
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time time-locale-compat unordered-containers uuid-types vector
+       ];
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-applicative" = callPackage
     ({ mkDerivation, aeson, base, text, unordered-containers }:
      mkDerivation {
@@ -20201,8 +20297,8 @@ self: {
        pname = "aeson-compat";
        version = "0.3.6";
        sha256 = "7aa365d9f44f708f25c939489528836aa10b411e0a3e630c8c2888670874d142";
-       revision = "1";
-       editedCabalFile = "8e6a7142358e3189e10f906f5a0d2ae2306a2191f9ebf8a7ad85a6c70e15e6d9";
+       revision = "2";
+       editedCabalFile = "1000ae33d38d919e685b31f6f4de79bab9298318ced3ded0ff7e4a24c10258c3";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring containers exceptions
          hashable nats scientific semigroups tagged text time
@@ -20259,6 +20355,8 @@ self: {
        pname = "aeson-extra";
        version = "0.4.0.0";
        sha256 = "78ecedf65f8b68c09223912878e2a055aa38536489eddc9b47911cbc05aba594";
+       revision = "1";
+       editedCabalFile = "2a114863b515ec4b326bd31e4493ce2bcf7598b03361f76b44637e62d334b621";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec base base-compat bytestring
          containers exceptions hashable parsec recursion-schemes scientific
@@ -20515,6 +20613,8 @@ self: {
        pname = "aeson-schema";
        version = "0.4.1.1";
        sha256 = "30e95de2018a74ba0883f681723a0797d08c52b73433e5f70e86c71ad64abcc5";
+       revision = "1";
+       editedCabalFile = "8eaab2581d0f6108befe4112cd0749876e14670ebebcff228f07985c508589e6";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -20659,6 +20759,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "affection" = callPackage
+    ({ mkDerivation, babl, base, clock, containers, gegl, glib, linear
+     , monad-loops, mtl, sdl2, text
+     }:
+     mkDerivation {
+       pname = "affection";
+       version = "0.0.0.1";
+       sha256 = "4d66b2b478888db84d13cd3557cc938902a97958e87bb9ea70dce9cd60e41f51";
+       libraryHaskellDepends = [
+         babl base clock containers gegl glib linear monad-loops mtl sdl2
+         text
+       ];
+       homepage = "https://github.com/nek0/affection#readme";
+       description = "A simple Game Engine using SDL";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "affine-invariant-ensemble-mcmc" = callPackage
     ({ mkDerivation, base, containers, mwc-random, primitive, split
      , vector
@@ -21383,6 +21500,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "algebraic-prelude" = callPackage
+    ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }:
+     mkDerivation {
+       pname = "algebraic-prelude";
+       version = "0.1.0.1";
+       sha256 = "8bb052b29571d4c07c03d14eb17f9d302f18e619bbe743509b9ec6e4fde2192d";
+       libraryHaskellDepends = [
+         algebra base basic-prelude lens semigroups
+       ];
+       homepage = "https://github.com/konn/algebraic-prelude#readme";
+       description = "Algebraically structured Prelude";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "algo-s" = callPackage
     ({ mkDerivation, base, bytestring, errors, foldl, hspec, mwc-random
      , optparse-applicative, primitive, QuickCheck, smallcheck
@@ -25009,17 +25140,20 @@ self: {
 
   "amqp-worker" = callPackage
     ({ mkDerivation, aeson, amqp, base, bytestring, data-default
-     , exceptions, monad-control, mtl, resource-pool, split, tasty
-     , tasty-hunit, text, transformers-base
+     , exceptions, monad-control, monad-loops, mtl, resource-pool, split
+     , tasty, tasty-hunit, text, transformers-base
      }:
      mkDerivation {
        pname = "amqp-worker";
-       version = "0.2.3";
-       sha256 = "41e7ed6f745cde27d451057958e5d017a6e6558ed5083f0cd0a10ee3bc757a09";
+       version = "0.2.4";
+       sha256 = "cc46b8d7f02c02dacc3e7a7c7d5e6c0d2338aec9afc4ca8e4f8c0d4f616a405f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson amqp base bytestring data-default exceptions monad-control
-         mtl resource-pool split text transformers-base
+         monad-loops mtl resource-pool split text transformers-base
        ];
+       executableHaskellDepends = [ aeson base exceptions text ];
        testHaskellDepends = [
          aeson amqp base bytestring tasty tasty-hunit text
        ];
@@ -25366,6 +25500,8 @@ self: {
        pname = "ansi-pretty";
        version = "0.1.2.1";
        sha256 = "708819f93f1759919a19dcfccddf3ddc8d9fba930cb73fab3ec9f6f5691394c6";
+       revision = "1";
+       editedCabalFile = "266eb754d15de06de1d488c82564bbf6c359e4e94e5210a58f2c18917a19d78d";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -26172,6 +26308,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "app-settings_0_2_0_10" = callPackage
+    ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
+     , parsec, text
+     }:
+     mkDerivation {
+       pname = "app-settings";
+       version = "0.2.0.10";
+       sha256 = "88dd9df76930467c14b764108cda92676a6702f68ad38a09c26e740bce29ac28";
+       libraryHaskellDepends = [
+         base containers directory mtl parsec text
+       ];
+       testHaskellDepends = [
+         base containers directory hspec HUnit mtl parsec text
+       ];
+       homepage = "https://github.com/emmanueltouzery/app-settings";
+       description = "A library to manage application settings (INI file-like)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "appar" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -26534,6 +26690,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXScrnSaver;};
 
+  "arbtt_0_9_0_12" = callPackage
+    ({ mkDerivation, aeson, array, base, binary, bytestring
+     , bytestring-progress, containers, deepseq, directory, filepath
+     , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
+     , tasty-golden, tasty-hunit, terminal-progress-bar, time
+     , transformers, unix, utf8-string, X11
+     }:
+     mkDerivation {
+       pname = "arbtt";
+       version = "0.9.0.12";
+       sha256 = "3bdd4171a6d68ff3604eb752d04fdc6e819ab90f021e65ff12f5f6c7e62e87cf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson array base binary bytestring bytestring-progress containers
+         deepseq directory filepath parsec pcre-light strict
+         terminal-progress-bar time transformers unix utf8-string X11
+       ];
+       executableSystemDepends = [ libXScrnSaver ];
+       testHaskellDepends = [
+         base binary bytestring containers deepseq directory parsec
+         pcre-light process-extras tasty tasty-golden tasty-hunit time
+         transformers unix utf8-string
+       ];
+       homepage = "http://arbtt.nomeata.de/";
+       description = "Automatic Rule-Based Time Tracker";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.xorg) libXScrnSaver;};
+
   "archive" = callPackage
     ({ mkDerivation, base, bytestring, debian, debian-mirror, directory
      , Extra, filepath, help, HUnit, mtl, network, old-locale, pretty
@@ -28533,6 +28719,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter_1_0_0" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "1.0.0";
+       sha256 = "459baf1bbb143a92a25f1de7b9ec416a5ee214bb763bfb5f5e49e10678aba0f3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/autoexporter#readme";
+       description = "Automatically re-export modules";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "autom" = callPackage
     ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss
      , JuicyPixels, random, vector
@@ -28694,10 +28896,10 @@ self: {
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.17.0";
-       sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d";
-       revision = "3";
-       editedCabalFile = "dd1745f57f0636a5932c361e931feec895221ae612acc37eaf2d819f349c75ae";
+       version = "0.0.17.1";
+       sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
+       revision = "4";
+       editedCabalFile = "00eb4a4386d3ed82d29c7f33c3c813074d33e25ce0c60872ca0a0cb78c3bd76c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -29574,6 +29776,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "babl" = callPackage
+    ({ mkDerivation, babl, base }:
+     mkDerivation {
+       pname = "babl";
+       version = "0.0.0.2";
+       sha256 = "c06c27e50875ab4fca4322112648006c49dc06158457fdb405df50eac9223245";
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ babl ];
+       libraryPkgconfigDepends = [ babl ];
+       homepage = "http://github.com/nek0/babl#readme";
+       description = "Haskell bindings to BABL library";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {inherit (pkgs) babl;};
+
   "babylon" = callPackage
     ({ mkDerivation, array, base, containers, random, wx, wxcore }:
      mkDerivation {
@@ -31405,6 +31621,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-ext" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
+     , directory, filepath, HUnit, QuickCheck, random, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "binary-ext";
+       version = "1.0";
+       sha256 = "0b7b4c7d4d2e5a08cf046eabbc66269aa187cfed4fcaeefcc5d95b4305a04837";
+       libraryHaskellDepends = [
+         array base binary bytestring containers
+       ];
+       testHaskellDepends = [
+         array base binary bytestring Cabal containers directory filepath
+         HUnit QuickCheck random test-framework test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/A1-Triard/binary-ext";
+       description = "An alternate with typed errors for Data.Binary.Get monad from 'binary' library.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "binary-file" = callPackage
     ({ mkDerivation, base, bytestring, monads-tf, peggy
      , template-haskell
@@ -31517,6 +31754,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-orphans_0_1_5_2" = callPackage
+    ({ mkDerivation, aeson, base, binary, case-insensitive, hashable
+     , QuickCheck, quickcheck-instances, scientific, tagged, tasty
+     , tasty-quickcheck, text, text-binary, time, unordered-containers
+     , vector, vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "binary-orphans";
+       version = "0.1.5.2";
+       sha256 = "7c644fb1d1657719c04c0f115a36efaeba7287c953de826b55c28fae87aca33d";
+       libraryHaskellDepends = [
+         aeson base binary case-insensitive hashable scientific tagged text
+         text-binary time unordered-containers vector
+         vector-binary-instances
+       ];
+       testHaskellDepends = [
+         aeson base binary case-insensitive hashable QuickCheck
+         quickcheck-instances scientific tagged tasty tasty-quickcheck text
+         time unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/binary-orphans#readme";
+       description = "Orphan instances for binary";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary-parser" = callPackage
     ({ mkDerivation, base-prelude, bytestring, success, text
      , transformers
@@ -31689,6 +31952,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784";
+       revision = "1";
+       editedCabalFile = "51f87f18bfe7ba8a3edc318cfb95f4aae9c2bb3feb54277553ac895b09ce0cf1";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -31876,32 +32141,32 @@ self: {
      }) {K8055D = null;};
 
   "bindings-apr" = callPackage
-    ({ mkDerivation, apr-1, base, bindings-DSL }:
+    ({ mkDerivation, apr, base, bindings-DSL }:
      mkDerivation {
        pname = "bindings-apr";
        version = "0.1";
        sha256 = "d324f6517ad3615aa7065e5f2a247f146655a7315ac70006ef0ded4bce0f873b";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ apr-1 ];
+       libraryPkgconfigDepends = [ apr ];
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {apr-1 = null;};
+     }) {inherit (pkgs) apr;};
 
   "bindings-apr-util" = callPackage
-    ({ mkDerivation, apr-util-1, base, bindings-apr, bindings-DSL }:
+    ({ mkDerivation, apr-util, base, bindings-apr, bindings-DSL }:
      mkDerivation {
        pname = "bindings-apr-util";
        version = "0.1";
        sha256 = "9d93dae4cb05d24a2fe50778bdf972df23ca0be5e8f85a85bb744e757720206b";
        libraryHaskellDepends = [ base bindings-apr bindings-DSL ];
-       libraryPkgconfigDepends = [ apr-util-1 ];
+       libraryPkgconfigDepends = [ apr-util ];
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {apr-util-1 = null;};
+     }) {apr-util = null;};
 
   "bindings-audiofile" = callPackage
     ({ mkDerivation, audiofile, base, bindings-DSL }:
@@ -32357,12 +32622,12 @@ self: {
      }) {};
 
   "bindings-portaudio" = callPackage
-    ({ mkDerivation, base, bindings-DSL, portaudio }:
+    ({ mkDerivation, base, bindings-DSL, portaudio, vector }:
      mkDerivation {
        pname = "bindings-portaudio";
-       version = "0.1";
-       sha256 = "22aa0157723500351d014ef609b4a6167e9e9ae69ddcc33e71d3c908c0c09d71";
-       libraryHaskellDepends = [ base bindings-DSL ];
+       version = "0.2";
+       sha256 = "362cfad6f1527d887224564682a7ff8f40c73ceed8ee803c78609bc523bab74b";
+       libraryHaskellDepends = [ base bindings-DSL vector ];
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
@@ -33597,8 +33862,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
-       revision = "7";
-       editedCabalFile = "b965b55168cd3f25ee55944fb39f9509c847bb48f69e8ec443614fc8ff4960dd";
+       revision = "8";
+       editedCabalFile = "b39980789d8a226fb984088b3ab9e63c96bd81f2ee7806bf124d420c4479fedc";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -34397,6 +34662,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bogocopy" = callPackage
+    ({ mkDerivation, base, directory, filemanip, filepath
+     , optparse-applicative, shelly, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "bogocopy";
+       version = "0.1.0.2";
+       sha256 = "4b2d4e376b8908805a09404fac4a7b73efd3f4549a515eb8e180fe46221de834";
+       revision = "1";
+       editedCabalFile = "9b68ad2f64094297c4631e652ab247e8d83c64b64b7f40528232b8c474a4dee4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filemanip filepath optparse-applicative shelly text
+         transformers unix
+       ];
+       homepage = "https://github.com/phlummox/bogocopy";
+       description = "Simple project template from stack";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "bogre-banana" = callPackage
     ({ mkDerivation, base, hogre, hois, monad-control, random
      , reactive-banana
@@ -35008,13 +35294,13 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "brainfuck-tut";
-       version = "0.7.0.1";
-       sha256 = "761ef393826ecc54b9a5ab2d37b0c1af9db169bf6edb02282df67a71e02a1855";
+       version = "0.7.0.2";
+       sha256 = "fd5ebdd26c1bcee0e064288e71f92bc8f458768058bfbbaa368f562f44090939";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
        executableHaskellDepends = [ array base ];
-       homepage = "https://gitlab.com/cpp.cabrera/brainfuck-tut";
+       homepage = "https://gitlab.com/queertypes/brainfuck-tut";
        description = "A simple BF interpreter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35233,6 +35519,7 @@ self: {
        homepage = "https://github.com/jb55/bson-lens";
        description = "BSON lenses";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "bson-mapping" = callPackage
@@ -37428,17 +37715,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cacophony_0_9_0" = callPackage
+  "cacophony_0_9_1" = callPackage
     ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
-     , cryptonite, deepseq, directory, exceptions, free, hlint, lens
-     , memory, monad-coroutine, mtl, safe-exceptions, text, transformers
+     , cryptonite, directory, exceptions, free, hlint, lens, memory
+     , monad-coroutine, mtl, safe-exceptions, text, transformers
      }:
      mkDerivation {
        pname = "cacophony";
-       version = "0.9.0";
-       sha256 = "7394383af54b84ff5efdb491cafa6ffc569266c522c7395ee099a45bbd0588cb";
+       version = "0.9.1";
+       sha256 = "cb60834c8b0571f2b2b54b6f9847960c71ffe5350c60791c439de6ba54c67c02";
        libraryHaskellDepends = [
-         base bytestring cryptonite deepseq exceptions free lens memory
+         base bytestring cryptonite exceptions free lens memory
          monad-coroutine mtl safe-exceptions transformers
        ];
        testHaskellDepends = [
@@ -39012,17 +39299,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cayley-client_0_3_0" = callPackage
+  "cayley-client_0_3_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "cayley-client";
-       version = "0.3.0";
-       sha256 = "6c2d35f5c70df4744c3cac4a3cda952bd6a36f0f40cbdcf79ec54670ab1c5e1a";
-       revision = "1";
-       editedCabalFile = "7bc68d5b02fa41ebd7652a4e0d080417f4a66e179f24e6cc70845dac0fbb9f63";
+       version = "0.3.1";
+       sha256 = "c2d8eeeebf3814a10abfadb032132c8f1deff393909312d17755a9547463ebf7";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -39056,8 +39341,8 @@ self: {
      }:
      mkDerivation {
        pname = "cblrepo";
-       version = "0.23.0";
-       sha256 = "bbb17315e0618e121f8c339a4758d41a0a4b9d7b594168978fdc13d7fff93281";
+       version = "0.24.0";
+       sha256 = "03c1728d5f5ac702e334d3b7ccf0ceb42c00f93dba6cce2cdd655f5d74f4af7a";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -40124,8 +40409,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "choice";
-       version = "0.1.1.0";
-       sha256 = "96245c66c3e2dd48aec6b9bba3198b336d4d111b10781e53c544b43b98c1a989";
+       version = "0.2.0";
+       sha256 = "89a70894e54acc8e1a178e6110f46b0efed6e8389c7fec9060048d154aa1f72e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mboes/choice#readme";
        description = "A solution to boolean blindness";
@@ -41858,20 +42143,18 @@ self: {
 
   "clit" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
-     , http-client, http-client-tls, http-types, optparse-applicative
-     , split
+     , data-default, http-client, http-client-tls, http-types, lens
+     , optparse-applicative, split
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.1.1.2";
-       sha256 = "5daac994e7e122d6e009cfbb8e87c9a6134c7157256d2c64dfb87d8b83503367";
-       revision = "1";
-       editedCabalFile = "a00ced1d7dcc50bae6eae37b415f304271ee08bec06b3d15f7ec60fe927bdad8";
+       version = "0.2.0.1";
+       sha256 = "64e698fb189b3ab06c52d43aa0a5da99104b46e8024687d13664610d795fe504";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson authenticate-oauth base bytestring http-client
-         http-client-tls http-types optparse-applicative split
+         aeson authenticate-oauth base bytestring data-default http-client
+         http-client-tls http-types lens optparse-applicative split
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
@@ -43825,17 +44108,35 @@ self: {
      }) {};
 
   "computational-algebra" = callPackage
-    ({ mkDerivation, algebra, base, containers, equational-reasoning
-     , heaps, lens, monad-loops, monomorphic, peggy, singletons
-     , sized-vector, tagged, type-natural
+    ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base
+     , constraints, containers, control-monad-loop, convertible, deepseq
+     , dlist, entropy, equational-reasoning, hashable, heaps, hmatrix
+     , hspec, HUnit, hybrid-vectors, lens, matrix, monad-loops
+     , MonadRandom, mono-traversable, monomorphic, mtl, parallel, primes
+     , process, QuickCheck, quickcheck-instances, reflection, semigroups
+     , singletons, sized, smallcheck, tagged, template-haskell
+     , test-framework, test-framework-hunit, text, type-natural, unamb
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "computational-algebra";
-       version = "0.3.0.0";
-       sha256 = "9dd0b12afcdf642cfed686820d2523291cb62a064122c51c78e45dfeae5e9226";
+       version = "0.4.0.0";
+       sha256 = "cb9fd9a9115a911f43837fedfdc96f91c07a3240eccbd64b111b73844562e9f6";
        libraryHaskellDepends = [
-         algebra base containers equational-reasoning heaps lens monad-loops
-         monomorphic peggy singletons sized-vector tagged type-natural
+         algebra algebraic-prelude arithmoi base constraints containers
+         control-monad-loop convertible deepseq dlist entropy
+         equational-reasoning hashable heaps hmatrix hybrid-vectors lens
+         matrix monad-loops MonadRandom mono-traversable monomorphic mtl
+         parallel primes reflection semigroups singletons sized tagged
+         template-haskell text type-natural unamb unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         algebra base constraints containers convertible deepseq
+         equational-reasoning hspec HUnit lens matrix MonadRandom
+         monomorphic process QuickCheck quickcheck-instances reflection
+         singletons sized smallcheck tagged test-framework
+         test-framework-hunit text type-natural vector
        ];
        homepage = "https://github.com/konn/computational-algebra";
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
@@ -46996,8 +47297,8 @@ self: {
      }:
      mkDerivation {
        pname = "crawlchain";
-       version = "0.1.1.4";
-       sha256 = "0754ba3c874648e6c6e84c17d2d729cc3427f3cad2f1d0f37fbbcb4841020917";
+       version = "0.1.1.7";
+       sha256 = "93c39d63111fd8bdc4222a763ff1cb289b4e1e9b5342a3f0273fa6180a6062f1";
        libraryHaskellDepends = [
          base bytestring directory HTTP network-uri split tagsoup time
        ];
@@ -47418,6 +47719,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cron_0_5_0" = callPackage
+    ({ mkDerivation, attoparsec, base, data-default-class, generics-sop
+     , mtl, mtl-compat, old-locale, quickcheck-instances, semigroups
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "cron";
+       version = "0.5.0";
+       sha256 = "ebffcf17d4ce054b50e97034ca94e73c82803494e0a507b49844740a968535b7";
+       libraryHaskellDepends = [
+         attoparsec base data-default-class mtl mtl-compat old-locale
+         semigroups text time
+       ];
+       testHaskellDepends = [
+         attoparsec base generics-sop quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck text time transformers-compat
+       ];
+       homepage = "http://github.com/michaelxavier/cron";
+       description = "Cron datatypes and Attoparsec parser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cron-compat" = callPackage
     ({ mkDerivation, attoparsec, base, cron, derive, hspec
      , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text
@@ -47611,10 +47936,10 @@ self: {
      }:
      mkDerivation {
        pname = "crypto-enigma";
-       version = "0.0.2.6";
-       sha256 = "eb162e2b4ea2d73bb3594e12438f02988e338ae58c602e817a31970163533142";
-       revision = "3";
-       editedCabalFile = "c94ac05824b4eb891ee0351c533f6b7a12586437b58c4615538903bfd807317c";
+       version = "0.0.2.8";
+       sha256 = "7868ad36d39243fef45e1f76be73709778442ad69dc18ad8066650a748c6e837";
+       revision = "1";
+       editedCabalFile = "7a7c682466a7ea07d0a755cb3f3c696083921734a90bcad745226b45b605a97e";
        libraryHaskellDepends = [ base containers MissingH mtl split ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "https://github.com/orome/crypto-enigma-hs";
@@ -48058,8 +48383,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite-openssl";
-       version = "0.4";
-       sha256 = "a8307454de4f85456660686815169d925cb90345f7ac016d0c5562c2755667ea";
+       version = "0.5";
+       sha256 = "a10bc2030bd3696c190562853a794c392ff1e5ab9b4adc6c05697526dc9ce25c";
        libraryHaskellDepends = [ base bytestring cryptonite memory ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [
@@ -48572,8 +48897,10 @@ self: {
      }:
      mkDerivation {
        pname = "cuda";
-       version = "0.7.5.1";
-       sha256 = "0910d9e4f0b3a46d9bda2de495ae9024799c21764bc543b99edea64e65180385";
+       version = "0.7.5.2";
+       sha256 = "749b2411255f699289d2989c8720b751940678bfbb621ccd8bb98eaf0a7b94d6";
+       revision = "1";
+       editedCabalFile = "dd05fcdff465dcbe7252532e3b9ba481d76548611e02bc28fce734378c093dee";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -49790,7 +50117,7 @@ self: {
 
   "data-default-extra" = callPackage
     ({ mkDerivation, base, data-default-class
-     , data-default-instances-base, data-default-instances-bytestring
+     , data-default-instances-bytestring
      , data-default-instances-case-insensitive
      , data-default-instances-containers
      , data-default-instances-new-base
@@ -49800,11 +50127,10 @@ self: {
      }:
      mkDerivation {
        pname = "data-default-extra";
-       version = "0.0.1";
-       sha256 = "ddd73777101f49566654bae02203424bc7f4dd55ba5b839b5d2d8d4fa6d0812e";
+       version = "0.1.0";
+       sha256 = "7feaac7ae76fae615736d9a1577cb26ebd11a9cae48c88235821497fd5dee5f9";
        libraryHaskellDepends = [
-         base data-default-class data-default-instances-base
-         data-default-instances-bytestring
+         base data-default-class data-default-instances-bytestring
          data-default-instances-case-insensitive
          data-default-instances-containers data-default-instances-new-base
          data-default-instances-old-locale data-default-instances-text
@@ -49855,6 +50181,8 @@ self: {
        pname = "data-default-instances-bytestring";
        version = "0.0.1";
        sha256 = "4c431278d0dc1054fd531281db70d8615f88d9b2a29924aba2567fb3cf647220";
+       revision = "1";
+       editedCabalFile = "592075c7d9f5bde9fe98d31dd2b7412cdb4bb29158b49bee04379fe0895aed3e";
        libraryHaskellDepends = [ base bytestring data-default-class ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString";
@@ -49868,6 +50196,8 @@ self: {
        pname = "data-default-instances-case-insensitive";
        version = "0.0.1";
        sha256 = "430135708ad9d0730a4c3a3d1eb574bdc6f07547a5a9c5f30202e1e786070ab4";
+       revision = "1";
+       editedCabalFile = "45a89ccc5e4e6dbca37c7c0826c1f1c75d774d49afa9ce94f0412edee53f1371";
        libraryHaskellDepends = [ case-insensitive data-default-class ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instance for CI type from case-insensitive package";
@@ -49898,16 +50228,12 @@ self: {
      }) {};
 
   "data-default-instances-new-base" = callPackage
-    ({ mkDerivation, base, data-default-class
-     , data-default-instances-base
-     }:
+    ({ mkDerivation, base, data-default-class }:
      mkDerivation {
        pname = "data-default-instances-new-base";
-       version = "0.0.1";
-       sha256 = "d923d291a26817f2bc54ba110efc8cb1cefcdb17c7a5af8e2d12506c594b7edc";
-       libraryHaskellDepends = [
-         base data-default-class data-default-instances-base
-       ];
+       version = "0.0.2";
+       sha256 = "831df35c14859b066767b56c746611aa9268e6352d2a45f6704d3859bf3ef143";
+       libraryHaskellDepends = [ base data-default-class ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for types in newer versions of base package";
        license = stdenv.lib.licenses.bsd3;
@@ -49931,6 +50257,8 @@ self: {
        pname = "data-default-instances-text";
        version = "0.0.1";
        sha256 = "db5d4c46cf36ce5956ffd0affe0f2c48e1c000b9bd61821d3e6c1b0171060cdf";
+       revision = "1";
+       editedCabalFile = "5a8acbe0d420430c2cc2dc7865fa69d179c9ad43dda47aefcc6560fed72e2204";
        libraryHaskellDepends = [ base data-default-class text ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for (lazy and strict) Text and Text Builder";
@@ -49944,6 +50272,8 @@ self: {
        pname = "data-default-instances-unordered-containers";
        version = "0.0.1";
        sha256 = "b382a7ea90fd61127782e95fa5e7ee3a17969b762bf0aac4efd15fa7c2552fc0";
+       revision = "1";
+       editedCabalFile = "fc2e79e605ef4fd67f222d11f43aaed40fbc08e3ca421cd29f5982a391f90ebe";
        libraryHaskellDepends = [
          data-default-class unordered-containers
        ];
@@ -49959,6 +50289,8 @@ self: {
        pname = "data-default-instances-vector";
        version = "0.0.1";
        sha256 = "9ac84473a3af8b0c5e795ea5f84a34a0c18c3b2d5e17ce428206203f9d794666";
+       revision = "1";
+       editedCabalFile = "8a78beb491235231802c98fb1a58fea519359be1c9374b9f08d37feed34a385e";
        libraryHaskellDepends = [ data-default-class vector ];
        homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for types defined in vector package";
@@ -50497,8 +50829,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-msgpack";
-       version = "0.0.8";
-       sha256 = "069552052ce2f62b64621513df5e4eec4a9dc9aa02f28e8095373724fc696ae0";
+       version = "0.0.9";
+       sha256 = "432b1e3f1cfbfe7cb165b139cb7379906b0f3126c381a64160aeb1f393b04b5c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52807,12 +53139,12 @@ self: {
      }) {};
 
   "deque" = callPackage
-    ({ mkDerivation, base-prelude }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "deque";
-       version = "0.1";
-       sha256 = "881f1118d18e1868a04443e2826aede8316a266ad93ce1e00a999834fa028e2d";
-       libraryHaskellDepends = [ base-prelude ];
+       version = "0.2";
+       sha256 = "86768d22492c58b35688c28592b222cb16cc996ca6576b35add9c54a470d3e56";
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/deque";
        description = "Double-ended queue";
        license = stdenv.lib.licenses.mit;
@@ -53503,6 +53835,8 @@ self: {
        pname = "diagrams-contrib";
        version = "1.4.0.1";
        sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c";
+       revision = "1";
+       editedCabalFile = "58ebbd4d2285416111e8582c133d68ced6ecb5a2a94d5dc07cca899a971b02f8";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -55702,6 +56036,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributive_0_5_1" = callPackage
+    ({ mkDerivation, base, base-orphans, directory, doctest, filepath
+     , tagged, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "distributive";
+       version = "0.5.1";
+       sha256 = "8fd0968c19b00b64c8219b81903c72841494460fcf1c10e84fa44f321bb3ae92";
+       libraryHaskellDepends = [
+         base base-orphans tagged transformers transformers-compat
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/distributive/";
+       description = "Distributive functors -- Dual to Traversable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diversity" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
@@ -57764,8 +58116,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamodb-simple";
-       version = "0.3.0.0";
-       sha256 = "5a1693cacc9d15727b4d0f71cf6015a71e2e5269b8872c9e50016ff6d0f7265b";
+       version = "0.4.0.0";
+       sha256 = "62a0361b19d0929a95d1821f8214aa44a87b7ffe1e0405abd84b4f81fc16ca79";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb base bytestring
          conduit containers double-conversion exceptions generics-sop
@@ -58674,6 +59026,8 @@ self: {
        pname = "either";
        version = "4.4.1.1";
        sha256 = "b087cb0fb63fec2fbdcac05fef0d03751daef5deb86cda3c732b9a6a31e634d3";
+       revision = "1";
+       editedCabalFile = "3276aff42f5ede169a424cdfbb69ae3ca7d9d4f95996e679c2d9ea1dae939db1";
        libraryHaskellDepends = [
          base bifunctors exceptions free mmorph monad-control MonadRandom
          mtl profunctors semigroupoids semigroups transformers
@@ -58726,6 +59080,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ekg_0_4_0_12" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
+     , filepath, network, snap-core, snap-server, text, time
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg";
+       version = "0.4.0.12";
+       sha256 = "f30e8c1e76410c3c76ec8cf59f0e1a381a83d302c02b5a95049238aa50eb9844";
+       libraryHaskellDepends = [
+         aeson base bytestring ekg-core ekg-json filepath network snap-core
+         snap-server text time transformers unordered-containers
+       ];
+       homepage = "https://github.com/tibbe/ekg";
+       description = "Remote monitoring of processes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ekg-bosun" = callPackage
     ({ mkDerivation, aeson, base, ekg-core, http-client, lens, network
      , network-uri, old-locale, text, time, unordered-containers, vector
@@ -58831,6 +59204,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ekg-json_0_1_0_4" = callPackage
+    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg-json";
+       version = "0.1.0.4";
+       sha256 = "6afc7c146e4891824bb672af94ef3cade56ebf17cc51a3ca9ffdd2ce4345e479";
+       libraryHaskellDepends = [
+         aeson base ekg-core text unordered-containers
+       ];
+       homepage = "https://github.com/tibbe/ekg-json";
+       description = "JSON encoding of ekg metrics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ekg-log" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, ekg-core
      , fast-logger, filepath, text, time, unix, unordered-containers
@@ -59141,7 +59530,6 @@ self: {
        homepage = "http://github.com/krisajenkins/elm-export";
        description = "A library to generate Elm types from Haskell source";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-export-persistent" = callPackage
@@ -59159,7 +59547,7 @@ self: {
        homepage = "https://github.com/jb55/elm-export-persistent";
        description = "elm-export persistent entities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "elm-get" = callPackage
@@ -61143,6 +61531,78 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eventsource-api" = callPackage
+    ({ mkDerivation, aeson, base, containers, mtl, protolude
+     , unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "eventsource-api";
+       version = "1.0.0";
+       sha256 = "3d72797d5d9b81f2f5f1e613d6681983d9fd541a6b5dd773d92b1982ced422e8";
+       libraryHaskellDepends = [
+         aeson base containers mtl protolude unordered-containers uuid
+       ];
+       homepage = "https://github.com/YoEight/eventsource-api#readme";
+       description = "Provides a eventsourcing high level API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "eventsource-geteventstore-store" = callPackage
+    ({ mkDerivation, aeson, base, eventsource-api
+     , eventsource-store-specs, eventstore, mtl, protolude, tasty
+     , tasty-hspec
+     }:
+     mkDerivation {
+       pname = "eventsource-geteventstore-store";
+       version = "1.0.0";
+       sha256 = "d14e33e0f73d2c6344d251253cd9f29551dd08ed627fa9b68845ac8e236dbafb";
+       libraryHaskellDepends = [
+         aeson base eventsource-api eventstore mtl protolude
+       ];
+       testHaskellDepends = [
+         base eventsource-api eventsource-store-specs eventstore protolude
+         tasty tasty-hspec
+       ];
+       homepage = "https://github.com/YoEight/eventsource-api#readme";
+       description = "GetEventStore store implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "eventsource-store-specs" = callPackage
+    ({ mkDerivation, aeson, base, eventsource-api, mtl, protolude
+     , tasty, tasty-hspec, uuid
+     }:
+     mkDerivation {
+       pname = "eventsource-store-specs";
+       version = "1.0.0";
+       sha256 = "11aa3453084571533ae6c7367b2f4e41de7af78f99b4d79e6b9b935dd3399047";
+       libraryHaskellDepends = [
+         aeson base eventsource-api mtl protolude tasty tasty-hspec uuid
+       ];
+       homepage = "https://github.com/YoEight/eventsource-api#readme";
+       description = "Provides common test specification for Store implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "eventsource-stub-store" = callPackage
+    ({ mkDerivation, base, containers, eventsource-api
+     , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec
+     }:
+     mkDerivation {
+       pname = "eventsource-stub-store";
+       version = "1.0.0";
+       sha256 = "6c50fd40a886098fb95f129d4769b68ffe3ffdb9135234d4db921ff6f5d17fef";
+       libraryHaskellDepends = [
+         base containers eventsource-api mtl protolude stm
+       ];
+       testHaskellDepends = [
+         base eventsource-store-specs protolude tasty tasty-hspec
+       ];
+       homepage = "https://github.com/YoEight/eventsource-api#readme";
+       description = "An in-memory stub store implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "eventsourced" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, HUnit, wai
      , wai-extra, warp
@@ -61473,6 +61933,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "executable-hash_0_2_0_4" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cryptohash, directory
+     , executable-path, file-embed, filepath, template-haskell
+     }:
+     mkDerivation {
+       pname = "executable-hash";
+       version = "0.2.0.4";
+       sha256 = "34eaf5662d90d3b7841f66b322ac5bc54900b0e3cb06792852b08b3c05a42ba4";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [
+         base bytestring Cabal cryptohash directory file-embed filepath
+         template-haskell
+       ];
+       libraryHaskellDepends = [
+         base bytestring cryptohash directory executable-path file-embed
+         template-haskell
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/fpco/executable-hash";
+       description = "Provides the SHA1 hash of the program executable";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "executable-path" = callPackage
     ({ mkDerivation, base, directory, filepath, unix }:
      mkDerivation {
@@ -62516,20 +63002,21 @@ self: {
      }) {};
 
   "fast-tags" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers, cpphs
-     , deepseq, directory, filepath, mtl, tasty, tasty-hunit, text
-     , utf8-string
+    ({ mkDerivation, alex, array, async, base, bytestring, containers
+     , cpphs, deepseq, directory, filepath, mtl, tasty, tasty-hunit
+     , text, utf8-string
      }:
      mkDerivation {
        pname = "fast-tags";
-       version = "1.2";
-       sha256 = "59033dc40770e9f96207b2ba6b458c68a3138f0102787e4858b71a4299d90eef";
+       version = "1.2.1";
+       sha256 = "6802c0275d28695c475d2cb41c4e2644b04d6f43befff0b6ac950081eb4cc0d3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array async base bytestring containers cpphs deepseq directory
          filepath mtl text utf8-string
        ];
+       libraryToolDepends = [ alex ];
        executableHaskellDepends = [
          async base bytestring containers directory filepath text
        ];
@@ -62746,6 +63233,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
+       revision = "2";
+       editedCabalFile = "c164132b3489ae1511bda64e9fb8fde6d05fdc4a1fcc0ff327efd9ce3b1d81ce";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64081,6 +64570,8 @@ self: {
        pname = "find-clumpiness";
        version = "0.2.0.1";
        sha256 = "87db2a011a2662481f59ac03f64e95ef6692519386aee51417c3894c2174da22";
+       revision = "1";
+       editedCabalFile = "8a86eb5b9161789d9cd65fb4d555442e1b1eb89e46ce7f4db928f700f6ee05ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -64726,6 +65217,47 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "flac" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , directory, exceptions, filepath, FLAC, hspec, mtl, temporary
+     , text, transformers, vector, wave
+     }:
+     mkDerivation {
+       pname = "flac";
+       version = "0.1.1";
+       sha256 = "58b7287cb39bdfc39cf7aab95b87d81111234fed502a8d1743ecfbcef001873e";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class directory exceptions
+         filepath mtl text transformers vector wave
+       ];
+       librarySystemDepends = [ FLAC ];
+       testHaskellDepends = [
+         base bytestring data-default-class directory filepath hspec
+         temporary transformers vector wave
+       ];
+       homepage = "https://github.com/mrkkrp/flac";
+       description = "Complete high-level binding to libFLAC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {FLAC = null;};
+
+  "flac-picture" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, directory
+     , flac, hspec, JuicyPixels, temporary
+     }:
+     mkDerivation {
+       pname = "flac-picture";
+       version = "0.1.0";
+       sha256 = "3c36dff9cebb44502a69e300f233e792900d051bd7eadc2c7390feb53efb3293";
+       libraryHaskellDepends = [ base bytestring flac JuicyPixels ];
+       testHaskellDepends = [
+         base bytestring data-default-class directory flac hspec JuicyPixels
+         temporary
+       ];
+       homepage = "https://github.com/mrkkrp/flac-picture";
+       description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flaccuraterip" = callPackage
     ({ mkDerivation, base, binary, deepseq, HTTP, optparse-applicative
      , process
@@ -65507,6 +66039,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foldl_1_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers
+     , contravariant, mwc-random, primitive, profunctors, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "foldl";
+       version = "1.2.2";
+       sha256 = "c869deb0dc7d41d496539968968ff6045022d1286dfb2c1d53f61dc974f455eb";
+       libraryHaskellDepends = [
+         base bytestring comonad containers contravariant mwc-random
+         primitive profunctors text transformers vector
+       ];
+       description = "Composable, streaming, and efficient left folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl-incremental" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, foldl
      , histogram-fill, mwc-random, pipes, QuickCheck, tasty
@@ -65536,14 +66086,14 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-statistics";
-       version = "0.1.4.0";
-       sha256 = "0d800d6202b6411207154f1c7d1be8f77fef7e332ccaf3c486db972c935cf414";
+       version = "0.1.4.1";
+       sha256 = "7abd5ed3ee0295de589484b0973f2531ae1956bf4ec1f237956c046bca106b28";
        libraryHaskellDepends = [
          base foldl math-functions profunctors semigroups
        ];
        testHaskellDepends = [
-         base foldl profunctors quickcheck-instances statistics tasty
-         tasty-quickcheck vector
+         base foldl profunctors quickcheck-instances semigroups statistics
+         tasty tasty-quickcheck vector
        ];
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
@@ -66175,10 +66725,8 @@ self: {
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.2";
-       sha256 = "d879240154104273197249b4fbd2bd6d6ad9739166a8a75e9484bf87b6d9388f";
-       revision = "1";
-       editedCabalFile = "171bd233fb790408501779243fdcbc2659911e55e39067efb80254bbcc3781e4";
+       version = "0.0.3";
+       sha256 = "72d7f2af963d42cb7e1164b854978ad3f351175449ba2d27c6b639ffca0b75fa";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -68268,6 +68816,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gegl" = callPackage
+    ({ mkDerivation, babl, base, containers, gegl, glib, inline-c
+     , monad-loops, random, split, template-haskell
+     }:
+     mkDerivation {
+       pname = "gegl";
+       version = "0.0.0.2";
+       sha256 = "475adb9ff07a1e8cc314e441c76e76e46919e842c77ec092b9ed8d7847549e95";
+       libraryHaskellDepends = [
+         babl base containers glib inline-c monad-loops random split
+         template-haskell
+       ];
+       librarySystemDepends = [ gegl ];
+       libraryPkgconfigDepends = [ gegl ];
+       homepage = "https://github.com/nek0/gegl#readme";
+       description = "Haskell bindings to GEGL library";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {inherit (pkgs) gegl;};
+
   "gelatin" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , file-embed, FontyFruity, gl, GLFW-b, JuicyPixels, lens, linear
@@ -69729,11 +70296,14 @@ self: {
      }) {};
 
   "ghc-paths" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, Cabal, directory }:
      mkDerivation {
        pname = "ghc-paths";
        version = "0.1.0.9";
        sha256 = "afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945";
+       revision = "1";
+       editedCabalFile = "b47858cf533ae8d72bd422106bcb9e075ae477ab2e537f59ffe437277840bcef";
+       setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
        license = stdenv.lib.licenses.bsd3;
@@ -69791,8 +70361,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-prof";
-       version = "1.2.0";
-       sha256 = "fcc0d06e75b6b753b9edec96cda46a4b67138a7ddd489da55dd351f475c08810";
+       version = "1.3.0.1";
+       sha256 = "8bb866a2389005d91f15a1546ef92e1055b854c9a14dda97d0d92fb0fa598b82";
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
@@ -70306,6 +70876,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghcjs-vdom" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, ghcjs-base
+     , ghcjs-ffiqq, ghcjs-prim, split, template-haskell
+     }:
+     mkDerivation {
+       pname = "ghcjs-vdom";
+       version = "0.2.0.0";
+       sha256 = "4a53dba09fc79b495f172584d0fa4e60d14453466098d9e221c8f3d0dc5d68c5";
+       libraryHaskellDepends = [
+         base containers ghc-prim ghcjs-base ghcjs-ffiqq ghcjs-prim split
+         template-haskell
+       ];
+       description = "Virtual-dom bindings for GHCJS";
+       license = stdenv.lib.licenses.mit;
+       broken = true;
+     }) {ghcjs-ffiqq = null; ghcjs-prim = null;};
+
   "ghcjs-websockets" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
      , ghcjs-base, text
@@ -70324,6 +70911,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghcjs-xhr" = callPackage
+    ({ mkDerivation, base, ghcjs-base, text }:
+     mkDerivation {
+       pname = "ghcjs-xhr";
+       version = "0.1.0.0";
+       sha256 = "14e8a6342d2ef912e14cd5a4bdc9f8712a6a92e43b2acc87d8e030085a51d91e";
+       libraryHaskellDepends = [ base ghcjs-base text ];
+       homepage = "https://github.com/tdammers/ghcjs-xhr";
+       description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghclive" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, diagrams-lib, diagrams-svg, directory, file-embed
@@ -71391,6 +71990,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gipeda_0_3_3_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava
+     , concurrent-output, containers, directory, extra, file-embed
+     , filepath, gitlib, gitlib-libgit2, scientific, shake, split
+     , tagged, text, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "gipeda";
+       version = "0.3.3.0";
+       sha256 = "9b3f111ed3b980a5b9a721948df16c6a05b28f3a805657d0cfa271e356169744";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring cassava concurrent-output containers
+         directory extra file-embed filepath gitlib gitlib-libgit2
+         scientific shake split tagged text transformers
+         unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/nomeata/gipeda";
+       description = "Git Performance Dashboard";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "giphy-api" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , directory, hspec, http-api-data, http-client, http-client-tls
@@ -71512,25 +72135,24 @@ self: {
      , clientsession, concurrent-output, conduit, conduit-extra
      , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
      , directory, disk-free-space, dlist, dns, edit-distance, esqueleto
-     , exceptions, fdo-notify, feed, filepath, free, git, gnupg, gnutls
+     , exceptions, fdo-notify, feed, filepath, free, git, gnupg
      , hinotify, hslogger, http-client, http-conduit, http-types, IfElse
      , lsof, magic, MissingH, monad-control, monad-logger, mountpoints
-     , mtl, network, network-info, network-multicast
-     , network-protocol-xmpp, network-uri, old-locale, openssh
-     , optparse-applicative, path-pieces, perl, persistent
-     , persistent-sqlite, persistent-template, process, QuickCheck
-     , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
-     , securemem, shakespeare, socks, stm, stm-chans, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-rerun, template-haskell, text, time
-     , torrent, transformers, unix, unix-compat, unordered-containers
-     , utf8-string, uuid, wai, wai-extra, warp, warp-tls, wget, which
-     , xml-types, yesod, yesod-core, yesod-default, yesod-form
-     , yesod-static
+     , mtl, network, network-info, network-multicast, network-uri
+     , old-locale, openssh, optparse-applicative, path-pieces, perl
+     , persistent, persistent-sqlite, persistent-template, process
+     , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore
+     , sandi, securemem, shakespeare, socks, stm, stm-chans, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-rerun, template-haskell
+     , text, time, torrent, transformers, unix, unix-compat
+     , unordered-containers, utf8-string, uuid, wai, wai-extra, warp
+     , warp-tls, wget, which, yesod, yesod-core, yesod-default
+     , yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20161210";
-       sha256 = "b568cceda32908e7cd66b34181811d4da3d3197d71009eac20c1c4c4379f6381";
+       version = "6.20170101";
+       sha256 = "5fbf88652a84278275d9d4bec083189f590b045e23a73bfe8d395c3e356e3f53";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -71548,17 +72170,17 @@ self: {
          case-insensitive clientsession concurrent-output conduit
          conduit-extra containers crypto-api cryptonite data-default DAV
          dbus directory disk-free-space dlist dns edit-distance esqueleto
-         exceptions fdo-notify feed filepath free gnutls hinotify hslogger
+         exceptions fdo-notify feed filepath free hinotify hslogger
          http-client http-conduit http-types IfElse magic MissingH
          monad-control monad-logger mountpoints mtl network network-info
-         network-multicast network-protocol-xmpp network-uri old-locale
-         optparse-applicative path-pieces persistent persistent-sqlite
-         persistent-template process QuickCheck random regex-tdfa resourcet
-         SafeSemaphore sandi securemem shakespeare socks stm stm-chans tasty
-         tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
-         torrent transformers unix unix-compat unordered-containers
-         utf8-string uuid wai wai-extra warp warp-tls xml-types yesod
-         yesod-core yesod-default yesod-form yesod-static
+         network-multicast network-uri old-locale optparse-applicative
+         path-pieces persistent persistent-sqlite persistent-template
+         process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
+         securemem shakespeare socks stm stm-chans tasty tasty-hunit
+         tasty-quickcheck tasty-rerun template-haskell text time torrent
+         transformers unix unix-compat unordered-containers utf8-string uuid
+         wai wai-extra warp warp-tls yesod yesod-core yesod-default
+         yesod-form yesod-static
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
@@ -71931,6 +72553,8 @@ self: {
        pname = "github";
        version = "0.15.0";
        sha256 = "f091c35c446619bace51bd4d3831563cccfbda896954ed98d2aed818feead609";
+       revision = "1";
+       editedCabalFile = "d56da89ceea0c330c54b4820d397e3cea2bba43978ca4dfa42bb153459d29f7d";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat base16-bytestring binary
          binary-orphans byteable bytestring containers cryptohash deepseq
@@ -72003,8 +72627,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-release";
-       version = "0.2.0";
-       sha256 = "847d33683b290360fdaa1a42dcbe5767920392e86abc357973d1e1afd2fac6c8";
+       version = "1.0.1";
+       sha256 = "a0e58b9e855cdf8617ba42436c974776800573951dcf680ec3072651fc10c5b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72463,15 +73087,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glabrous_0_2_1" = callPackage
+  "glabrous_0_2_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "glabrous";
-       version = "0.2.1";
-       sha256 = "79793394c25a1f7bdb0c57e634a8ad37824a2a108272d521cf9fe78bdf9a70a4";
+       version = "0.2.3";
+       sha256 = "f9e1c11f1702a1710cd172c972d618dcecc62197b7b37f66aa31a2aad45e4bad";
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring cereal cereal-text
          either text unordered-containers
@@ -72570,6 +73194,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gli" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , friendly-time, http-client, http-client-tls, http-conduit
+     , network-uri, optparse-applicative, process, text, time, yaml
+     }:
+     mkDerivation {
+       pname = "gli";
+       version = "0.0.1.1";
+       sha256 = "0f328a32ec9d700fc89d4e517917f5d47053ff822ad3eb29129100cc43f6943b";
+       revision = "1";
+       editedCabalFile = "209b399769c48d612e034f597367705b1cea6a3eccabaf35213af7429e1d273f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers friendly-time
+         http-client http-client-tls http-conduit network-uri
+         optparse-applicative process text time yaml
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/goromlagche/gli#readme";
+       description = "Tiny cli to fetch PR info from gitlab";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "glib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , gtk2hs-buildtools, text, utf8-string
@@ -72644,6 +73293,8 @@ self: {
        pname = "glirc";
        version = "2.20.2";
        sha256 = "acefc316a6075dbeb2fa95bf1ee99a8e4c3097eaf5be9273d676719d07a94b00";
+       revision = "1";
+       editedCabalFile = "4eb4ef433d48ddf947ede4423212b39ea82b665e50b17d2a0cf6ac3154cc33dd";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -72821,6 +73472,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss_1_10_2_5" = callPackage
+    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
+     , gloss-rendering, GLUT, OpenGL
+     }:
+     mkDerivation {
+       pname = "gloss";
+       version = "1.10.2.5";
+       sha256 = "e5c7c345892829f72966b5ade73b98702fe3a0c325e27c7b92e24c1a5ddc42c5";
+       libraryHaskellDepends = [
+         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
+       ];
+       homepage = "http://gloss.ouroborus.net";
+       description = "Painless 2D vector graphics, animations and simulations";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
      mkDerivation {
@@ -76252,6 +76920,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gopher-proxy" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory, errors
+     , http-types, lucid, mime-types, network, optparse-applicative
+     , text, wai, warp
+     }:
+     mkDerivation {
+       pname = "gopher-proxy";
+       version = "0.1.0.2";
+       sha256 = "6f06b79fb6edf8df020e104feba3db960fc9e6ca4198d860de1702d752053fdd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base bytestring directory errors http-types lucid
+         mime-types network optparse-applicative text wai warp
+       ];
+       homepage = "https://github.com/sternenseemann/gopher-proxy";
+       description = "proxy gopher over http";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "gopherbot" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-postgresql, MissingH, network
      , parsec, unix
@@ -79363,20 +80051,19 @@ self: {
      }) {};
 
   "hack2-interface-wai" = callPackage
-    ({ mkDerivation, air, base, bytestring, case-insensitive
-     , containers, data-default, hack2, http-types, mtl, network, safe
-     , wai
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , data-default, hack2, http-types, network, safe, wai
      }:
      mkDerivation {
        pname = "hack2-interface-wai";
-       version = "2012.5.25";
-       sha256 = "bcd41cc56d8c21b778083b3efdb34f6d34892b0ee3272c9842e17785c6dadea3";
+       version = "2017.1.4";
+       sha256 = "db7e508b87c8bb0a0b0eb4a00558ca5feadd4ddbf290da5cc5bb3511a37352ea";
        libraryHaskellDepends = [
-         air base bytestring case-insensitive containers data-default hack2
-         http-types mtl network safe wai
+         base bytestring case-insensitive containers data-default hack2
+         http-types network safe wai
        ];
        homepage = "https://github.com/nfjinjing/hack2-interface-wai";
-       description = "Hack2 interface of WAI";
+       description = "Hack2 interface to WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -80645,8 +81332,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-sass";
-       version = "0.2.2";
-       sha256 = "14e3076b7921f37ecd0edf736be931536705461b66755387ec7813aa5e3e8302";
+       version = "0.2.3";
+       sha256 = "ebc3abf417733f776e0235573b9b36113c130d0b1e7748361ff0d649bad67422";
        libraryHaskellDepends = [
          aeson-pretty base data-default-class filepath hakyll hsass
        ];
@@ -80767,26 +81454,32 @@ self: {
      }) {};
 
   "halive" = callPackage
-    ({ mkDerivation, base, bin-package-db, containers, directory
-     , filepath, foreign-store, fsnotify, ghc, ghc-paths, process
-     , transformers
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, linear
+     , mtl, process, random, sdl2, signal, stm, text, time, transformers
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.0.7";
-       sha256 = "1c0e073e4769fedec470f7518fb1e20eff8d5b7a56fe8a03ec186aaf5ae71398";
+       version = "0.1.2";
+       sha256 = "465255836639653f42763d8b04a39840af35bde77b3cdfc53a419a44a96f902d";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers foreign-store ];
+       libraryHaskellDepends = [
+         base containers directory filepath foreign-store fsnotify ghc
+         ghc-boot ghc-paths mtl process signal stm time transformers
+       ];
        executableHaskellDepends = [
-         base bin-package-db directory filepath fsnotify ghc ghc-paths
-         process transformers
+         base directory filepath fsnotify ghc ghc-paths process stm
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers filepath foreign-store gl linear mtl
+         random sdl2 stm text time
        ];
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
-       broken = true;
-     }) {bin-package-db = null;};
+     }) {};
 
   "halma" = callPackage
     ({ mkDerivation, async, base, containers, data-default
@@ -81242,8 +81935,8 @@ self: {
      }) {};
 
   "happindicator" = callPackage
-    ({ mkDerivation, appindicator, array, base, bytestring, containers
-     , glib, gtk, gtk2hs-buildtools, mtl
+    ({ mkDerivation, array, base, bytestring, containers, glib, gtk
+     , gtk2hs-buildtools, libappindicator-gtk2, mtl
      }:
      mkDerivation {
        pname = "happindicator";
@@ -81252,26 +81945,26 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers glib gtk mtl
        ];
-       libraryPkgconfigDepends = [ appindicator ];
+       libraryPkgconfigDepends = [ libappindicator-gtk2 ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {appindicator = null;};
+     }) {inherit (pkgs) libappindicator-gtk2;};
 
   "happindicator3" = callPackage
-    ({ mkDerivation, appindicator, base, glib, gtk3 }:
+    ({ mkDerivation, base, glib, gtk3, libappindicator-gtk3 }:
      mkDerivation {
        pname = "happindicator3";
        version = "0.2.1";
        sha256 = "225156270dc7cb2bb399aee76c9273a62683d8835c7045027a7906a3cf010326";
        libraryHaskellDepends = [ base glib gtk3 ];
-       libraryPkgconfigDepends = [ appindicator ];
+       libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {appindicator = null;};
+     }) {inherit (pkgs) libappindicator-gtk3;};
 
   "happraise" = callPackage
     ({ mkDerivation, base, directory, filepath }:
@@ -82437,6 +83130,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashable_1_2_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
+     , QuickCheck, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, unix
+     }:
+     mkDerivation {
+       pname = "hashable";
+       version = "1.2.5.0";
+       sha256 = "153eb1614a739f3ccf8c5fcd4230a17b8b24862ab727c46dd4acd22bc15fb2bc";
+       libraryHaskellDepends = [
+         base bytestring ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
+         base bytestring ghc-prim HUnit QuickCheck random test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix
+       ];
+       homepage = "http://github.com/tibbe/hashable";
+       description = "A class for types that can be converted to a hash value";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashable-extras" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
      , filepath, hashable, transformers, transformers-compat
@@ -82445,6 +83160,8 @@ self: {
        pname = "hashable-extras";
        version = "0.2.3";
        sha256 = "03e0303a50e265d8682402152c90e199d0f4685a1e553bf20a380652d6f06b6a";
+       revision = "1";
+       editedCabalFile = "8d70988312a39286abbbbbcae27964def38ed93ae680fad6c2900d5a962948c7";
        libraryHaskellDepends = [
          base bifunctors bytestring hashable transformers
          transformers-compat
@@ -83947,8 +84664,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "0.4.0.0";
-       sha256 = "467845d216b9f4799c0ab681b2046df5cd410a170b9e6b78cf351b047f5bb70b";
+       version = "0.4.1.0";
+       sha256 = "00aed2236a37a582ff761b0a83946e3bdfa9027098c18d75ad7e34577a775ac5";
        libraryHaskellDepends = [
          base ghc mtl references template-haskell uniplate
        ];
@@ -84019,8 +84736,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "0.4.0.0";
-       sha256 = "72755148f8866075be70a3b244d451b3f0755e53cc14b94401d7cd3c80dfd279";
+       version = "0.4.1.0";
+       sha256 = "5607c50d38a26db49abd936fee9aac96bf332496bc7cbb9fe20e10bf929e63f6";
        libraryHaskellDepends = [
          base bytestring containers ghc haskell-tools-ast mtl references
          safe split template-haskell transformers uniplate
@@ -84039,8 +84756,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
-       version = "0.4.0.0";
-       sha256 = "0bc38f0d805b3d7bb0f643a83e217d7ff6139bc561c15ad4d8b45e208da9de37";
+       version = "0.4.1.0";
+       sha256 = "43ec482527444bd15382c93a866d50cdde39ecd53968eabc041dcbbc3a55872a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84066,8 +84783,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-daemon";
-       version = "0.4.0.0";
-       sha256 = "a339059dcdcaf2af3d622d61c64c3467e849748d27525d6d66c8e135ed5b5aeb";
+       version = "0.4.1.0";
+       sha256 = "b028a4c3e9a0701e563d1c12b45fe7bfdad1705232f4170cc23632967437de2c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84086,6 +84803,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-tools-debug" = callPackage
+    ({ mkDerivation, base, ghc, ghc-paths, haskell-tools-ast
+     , haskell-tools-backend-ghc, haskell-tools-prettyprint
+     , haskell-tools-refactor, references
+     }:
+     mkDerivation {
+       pname = "haskell-tools-debug";
+       version = "0.4.1.0";
+       sha256 = "aae428cb78d3923eecdc2a183ed397578b3dc38c29af77bba44dadaf50dd66ef";
+       libraryHaskellDepends = [
+         base ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
+         haskell-tools-prettyprint haskell-tools-refactor references
+       ];
+       homepage = "https://github.com/haskell-tools/haskell-tools";
+       description = "Debugging Tools for Haskell-tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-tools-demo" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, ghc, ghc-paths, haskell-tools-ast
@@ -84096,8 +84831,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "0.4.0.0";
-       sha256 = "1e52d8e1408323d75fd8f15344328c1f7ea194f7662d632cbb28e384fca05451";
+       version = "0.4.1.0";
+       sha256 = "9a65654bd6d95a6a5ea2ec2ed46a64d2d6aebd74fad864deeda0980b2a50f0e6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84123,8 +84858,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "0.4.0.0";
-       sha256 = "408fca758679e050c8a984e635853d356b9f1c5141add998e3fbf67e24fafbaf";
+       version = "0.4.1.0";
+       sha256 = "9ca7aecc1e36ea004e2017cf5a7afcc9b6ad4300a9efdffcc68275498bb254a7";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references split uniplate
        ];
@@ -84144,8 +84879,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "0.4.0.0";
-       sha256 = "066cc62a3d553ff7510f64acd4627baa154e65e4d941ac74402aa7b978394c93";
+       version = "0.4.1.0";
+       sha256 = "743e02a1485686df0e6fe6fef2fee473b099cda89323a7b5e35bb9bf17481366";
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-paths
          haskell-tools-ast haskell-tools-backend-ghc
@@ -84172,8 +84907,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "0.4.0.0";
-       sha256 = "a47604c77b77a5ca1ca5ce0c5c517a68d7cdc33d9b056f7fd5f98d3756af61a2";
+       version = "0.4.1.0";
+       sha256 = "bfa733c82af102a594c7c8ce3d044465f02874a685e0b39e8cc48d3659758282";
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
          references
@@ -86409,18 +87144,22 @@ self: {
      }) {};
 
   "hburg" = callPackage
-    ({ mkDerivation, array, base, containers, filepath, haskell98, mtl
+    ({ mkDerivation, alex, array, base, containers, filepath, happy
+     , mtl, pretty, utf8-string
      }:
      mkDerivation {
        pname = "hburg";
-       version = "1.1.2";
-       sha256 = "db311af08ba1a90fdb5b8bd66d02ac073e004f19631419da9615165d1f04ed0d";
+       version = "1.1.3";
+       sha256 = "fe1ce07466f899d4149f68fdef21f1969228f8cc7db26f5c23b058c7a4d651ba";
+       revision = "2";
+       editedCabalFile = "c60173c9ea5804ed889632498f121be17ad755fef0486bedf6009bee9538b7ce";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base containers filepath haskell98 mtl
+         array base containers filepath mtl pretty utf8-string
        ];
-       homepage = "http://www.bytelabs.org/hburg.html";
+       executableToolDepends = [ alex happy ];
+       homepage = "https://www.bytelabs.org/project/haskell-bottom-up-rewrite-generator/";
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87342,8 +88081,8 @@ self: {
        pname = "heist";
        version = "1.0.1.0";
        sha256 = "fd4ff3c1bfc1473feb9e913a5cdecaf56bc9db022abc27a76768cb6345c68bcb";
-       revision = "1";
-       editedCabalFile = "35cc7972ed625260f5f5885852551b9151cea0fad1c9855af09c5d82e20ae830";
+       revision = "2";
+       editedCabalFile = "17d5d80fc0a124f4e7159d50458067418ee6578484fb71b64f128aecc45cb663";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist filepath hashable
@@ -88096,8 +88835,8 @@ self: {
      }:
      mkDerivation {
        pname = "heterocephalus";
-       version = "1.0.2.0";
-       sha256 = "d0ec193259c06ae95d5e05c17cd42087465e876d04248212d58dc4ccd72004f3";
+       version = "1.0.2.3";
+       sha256 = "653de3568644936d8e011bb329efd763d3b9d9f03101b9cf6486c45532453046";
        libraryHaskellDepends = [
          base blaze-html blaze-markup containers dlist parsec shakespeare
          template-haskell text
@@ -88401,8 +89140,8 @@ self: {
      }:
      mkDerivation {
        pname = "heyefi";
-       version = "1.0.0.0";
-       sha256 = "76faae3d15478468c5c77021e8de886143da550e11e540fbd0e4abf8e1f24886";
+       version = "1.1.0.0";
+       sha256 = "ddbb1e25fd3b46ce1fc867563215392d2a5c0d85f1f7f864d3a3dce36954cc13";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88773,6 +89512,8 @@ self: {
        pname = "hgettext";
        version = "0.1.30";
        sha256 = "26453a4d359c99c41d462db9f8c9144d172523b3fa7076117a877e6c43f3ffdd";
+       revision = "2";
+       editedCabalFile = "b2aff15e79fb791bf70c0d12182e79b7e686b356f0637d9355c4c823c1a9c5c8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90297,8 +91038,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.0.1";
-       sha256 = "835de42bebfbf55a53714c24ea4df31b625ee12f0766aa83aa552ba6c39b7104";
+       version = "1.1";
+       sha256 = "b254b2a3918e047ca031f6dfafc42dd5fcb4b859157fae2d019dcd95262408e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90337,8 +91078,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.0";
-       sha256 = "80f4f4eef2c1df68e8013e78a1c5165a0f7c5150f7c4249353698afa078056fd";
+       version = "1.1";
+       sha256 = "182b8bdaf2b4b7d621a8570f0fa81a34de4f34f1a41f8dca6d60c05dd5701b1c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90395,10 +91136,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.1.1";
-       sha256 = "89a1d0846caccdd7a7272821cef105ec6fb405d4b3390b0e335fc036e25c8386";
-       revision = "1";
-       editedCabalFile = "518e975bfd1de87c7cfbbaaa0f710d450e3f5e344725510377cb64abcf11baee";
+       version = "1.1.2";
+       sha256 = "2a224047975e11f7c443c21a8f67bd0b58a058de370a9103ae020d3968450e17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90444,8 +91183,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.9";
-       sha256 = "76266868cb7a1a82483f1f622b3a5f88bc1d2eec8691f264c12761df74147016";
+       version = "0.1.1.10";
+       sha256 = "98106ff70769503a8056da205dcca59bc8b1fd6b2a9e1e47c56c90a4f373add4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90459,27 +91198,30 @@ self: {
   "hledger-lib" = callPackage
     ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
      , cmdargs, containers, csv, data-default, Decimal, deepseq
-     , directory, doctest, filepath, Glob, HUnit, megaparsec, mtl
-     , mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe
-     , semigroups, split, test-framework, test-framework-hunit, text
-     , time, transformers, uglymemo, utf8-string
+     , directory, doctest, filepath, Glob, hashtables, HUnit, megaparsec
+     , mtl, mtl-compat, old-time, parsec, parsers, pretty-show
+     , regex-tdfa, safe, semigroups, split, system-filepath
+     , test-framework, test-framework-hunit, text, time, transformers
+     , trifecta, uglymemo, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.0.1";
-       sha256 = "9a30c51859a4e75a9d3fdd123cb1d13e250f345911ce2b3acefbd921e4248ac6";
+       version = "1.1";
+       sha256 = "4142142fb92e6c1affc1420e3478449cf0d9d696ab05cc801338a562a5560556";
        libraryHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
-         csv data-default Decimal deepseq directory filepath HUnit
-         megaparsec mtl mtl-compat old-time parsec pretty-show regex-tdfa
-         safe semigroups split text time transformers uglymemo utf8-string
+         csv data-default Decimal deepseq directory filepath hashtables
+         HUnit megaparsec mtl mtl-compat old-time parsec parsers pretty-show
+         regex-tdfa safe semigroups split system-filepath text time
+         transformers trifecta uglymemo utf8-string
        ];
        testHaskellDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
          csv data-default Decimal deepseq directory doctest filepath Glob
-         HUnit megaparsec mtl mtl-compat old-time pretty-show regex-tdfa
-         safe split test-framework test-framework-hunit text time
-         transformers uglymemo utf8-string
+         hashtables HUnit megaparsec mtl mtl-compat old-time parsec parsers
+         pretty-show regex-tdfa safe split system-filepath test-framework
+         test-framework-hunit text time transformers trifecta uglymemo
+         utf8-string
        ];
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
@@ -90487,24 +91229,23 @@ self: {
      }) {};
 
   "hledger-ui" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-compat, brick, cmdargs
-     , containers, data-default, filepath, hledger, hledger-lib, HUnit
-     , megaparsec, microlens, microlens-platform, pretty-show, process
-     , safe, split, text, text-zipper, time, transformers, vector, vty
+    ({ mkDerivation, ansi-terminal, async, base, base-compat, brick
+     , cmdargs, containers, data-default, directory, filepath, fsnotify
+     , hledger, hledger-lib, HUnit, megaparsec, microlens
+     , microlens-platform, pretty-show, process, safe, split, text
+     , text-zipper, time, transformers, vector, vty
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.0.5";
-       sha256 = "ba859b4c1f8199413c30ddc0db2a7e11206d79ae235e6d9005de6d6cc1b98875";
-       revision = "2";
-       editedCabalFile = "6ef7d005fa20fd8c0001944f37f618305af941d1a8bdb91c6a4f2422fa23b69f";
+       version = "1.1";
+       sha256 = "2a059c50a02a360b5fa501fcb4a29ad5197b763a5e38572405a3c3a380cf6ea3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base base-compat brick cmdargs containers
-         data-default filepath hledger hledger-lib HUnit megaparsec
-         microlens microlens-platform pretty-show process safe split text
-         text-zipper time transformers vector vty
+         ansi-terminal async base base-compat brick cmdargs containers
+         data-default directory filepath fsnotify hledger hledger-lib HUnit
+         megaparsec microlens microlens-platform pretty-show process safe
+         split text text-zipper time transformers vector vty
        ];
        homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
@@ -90542,8 +91283,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.0.1";
-       sha256 = "e552af5e781ecc8e46bc7ff5a17333c739b18b9cbdcdca08840703b0b7cc59f8";
+       version = "1.1";
+       sha256 = "da0c0c1096497737540efdc85cbb95cd01cbd48410491d8b2c26529b4151a2ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90976,8 +91717,8 @@ self: {
     ({ mkDerivation, base, hmatrix, QuadProgpp, vector }:
      mkDerivation {
        pname = "hmatrix-quadprogpp";
-       version = "0.3.0.0";
-       sha256 = "fd11ea7d5dca8e703a5b0b80832883f27d2dd3941d19171b0f05a163d68b31fb";
+       version = "0.3.0.1";
+       sha256 = "b4a9284ad7af2a6f3e4bb57fa38160b2f4131959ff82f7e2ef74a7bdc753d1d4";
        libraryHaskellDepends = [ base hmatrix vector ];
        librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
@@ -91246,6 +91987,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mpfr;};
 
+  "hmpfr_0_4_2_1" = callPackage
+    ({ mkDerivation, base, integer-gmp, mpfr }:
+     mkDerivation {
+       pname = "hmpfr";
+       version = "0.4.2.1";
+       sha256 = "ccb27dec6053e05b58ba6c1b27373ed78fb91ee0792c08158c59eec409ac0a11";
+       libraryHaskellDepends = [ base integer-gmp ];
+       librarySystemDepends = [ mpfr ];
+       homepage = "https://github.com/michalkonecny/hmpfr";
+       description = "Haskell binding to the MPFR library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mpfr;};
+
   "hmt" = callPackage
     ({ mkDerivation, array, base, bytestring, colour, containers
      , data-ordlist, directory, filepath, lazy-csv, logict
@@ -92154,23 +92909,23 @@ self: {
      , conduit-extra, connection, containers, deepseq, directory, extra
      , filepath, haskell-src-exts, http-conduit, http-types, js-flot
      , js-jquery, mmap, network, network-uri, old-locale, process
-     , QuickCheck, resourcet, tar, template-haskell, text, time
-     , transformers, uniplate, utf8-string, vector, wai, wai-logger
-     , warp, warp-tls, zlib
+     , process-extras, QuickCheck, resourcet, tar, template-haskell
+     , text, time, transformers, uniplate, utf8-string, vector, wai
+     , wai-logger, warp, warp-tls, zlib
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.7";
-       sha256 = "a6ef18db8d3e10707771c216af33e166130ba664eae380b060a1669e44454409";
+       version = "5.0.8";
+       sha256 = "a5096f5a5786a654a7fd7eb8b019899056c70f51c3fe207df67ecd1c83400dd5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary bytestring cmdargs conduit conduit-extra
          connection containers deepseq directory extra filepath
          haskell-src-exts http-conduit http-types js-flot js-jquery mmap
-         network network-uri old-locale process QuickCheck resourcet tar
-         template-haskell text time transformers uniplate utf8-string vector
-         wai wai-logger warp warp-tls zlib
+         network network-uri old-locale process process-extras QuickCheck
+         resourcet tar template-haskell text time transformers uniplate
+         utf8-string vector wai wai-logger warp warp-tls zlib
        ];
        executableHaskellDepends = [ base ];
        testTarget = "--test-option=--no-net";
@@ -97971,6 +98726,8 @@ self: {
        pname = "http-api-data";
        version = "0.3.3";
        sha256 = "cb3d7ef8a924a6b03481b7c5e26a580df72cbf89f2e8247e825f43f4b3ba8449";
+       revision = "1";
+       editedCabalFile = "1b9b0887231d162187782afe3fa8e5483b896fafd8772bc22203027ae87bc48c";
        libraryHaskellDepends = [
          base bytestring containers hashable text time time-locale-compat
          unordered-containers uri-bytestring uuid-types
@@ -99343,6 +100100,37 @@ self: {
        broken = true;
      }) {hunt-client = null;};
 
+  "hup" = callPackage
+    ({ mkDerivation, base, bytestring, cmdargs, directory, doctest
+     , filepath, Glob, hspec, hspec-wai, http-client, http-client-tls
+     , http-types, mtl, QuickCheck, shelly, simple, split, tagsoup, tar
+     , temporary, text, transformers, wai, wai-extra, zlib
+     }:
+     mkDerivation {
+       pname = "hup";
+       version = "0.2.0.0";
+       sha256 = "add1d919aa2a1fd1ea914cd92c4ac3a5b24f9291a336393fd44f5b53052898ae";
+       revision = "1";
+       editedCabalFile = "a9563b96beaf19663d3878e50ae4f2b3ad37b3ebf154f32366da2e4f34f8d091";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory filepath http-client http-client-tls
+         http-types mtl split tar zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs directory mtl shelly tagsoup text
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring doctest filepath Glob hspec hspec-wai http-client
+         http-types QuickCheck simple temporary transformers wai wai-extra
+       ];
+       homepage = "https://github.com/phlummox/hup";
+       description = "Upload packages or documentation to a hackage server";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "hurdle" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, kangaroo }:
      mkDerivation {
@@ -100015,6 +100803,8 @@ self: {
        pname = "hworker";
        version = "0.1.0.1";
        sha256 = "34cbcc4db8f190ab0dc02a072adcf1fc75b7beab7e545982872bf265a1223f1d";
+       revision = "1";
+       editedCabalFile = "c5f32a8283ca858e67b2a49a51c41b36aa661228eca1bc6fc4c22293ddbe4b70";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hedis text time uuid
        ];
@@ -100036,6 +100826,8 @@ self: {
        pname = "hworker-ses";
        version = "0.1.1.0";
        sha256 = "dd5330691585b39ff0ddba8eb7edd2129a5610bae8a0493c2855f2786a3581c7";
+       revision = "1";
+       editedCabalFile = "884c06fd223afeaf51e216d500ad6350c7c8a4fe11e826b6a6191e5c10927f6d";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-ses base hworker lens text
          time unordered-containers
@@ -103415,8 +104207,8 @@ self: {
        pname = "insert-ordered-containers";
        version = "0.2.0.0";
        sha256 = "0353fcf5c58e9ed3fe33ddc3f57bfb2faccaa4d61fbf832f7fc2bfbe2c30d02e";
-       revision = "3";
-       editedCabalFile = "66f19e15a4787bbad6c85303e5ae7ba0912d2db8b18b500e5e6e437156e53d2a";
+       revision = "4";
+       editedCabalFile = "b4b8544fe733ff569ff0f726a632c9c10831f3c7bff804ec5d75f62225363fa5";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -103646,6 +104438,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "integer-logarithms" = callPackage
+    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "integer-logarithms";
+       version = "1";
+       sha256 = "9a34b7a9ea6cf0e760159913f41305f786fd027efce3c4e4fe700c2a46cf103c";
+       libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
+       testHaskellDepends = [
+         base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/phadej/integer-logarithms";
+       description = "Integer logarithms";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "integer-pure" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -104025,8 +104836,8 @@ self: {
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.0.2.0";
-       sha256 = "21cab2d2d744ace03a892f06970db52f9f12294b9e04aa8dfca1c91d3ccef1c4";
+       version = "0.0.2.2";
+       sha256 = "9dc34d967b510b6022f55a4a653a13fcf36513ba753d5b3f8a156d88060e5611";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
@@ -104037,6 +104848,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "intro-prelude" = callPackage
+    ({ mkDerivation, intro }:
+     mkDerivation {
+       pname = "intro-prelude";
+       version = "0.1.0.0";
+       sha256 = "602df3463f556cfff5b3784b7b49f0548768f11e7651175fae1028f4565faaba";
+       libraryHaskellDepends = [ intro ];
+       testHaskellDepends = [ intro ];
+       doHaddock = false;
+       homepage = "https://github.com/minad/intro-prelude#readme";
+       description = "Intro reexported as Prelude";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "introduction" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , exceptions, filepath, ghc-prim, lifted-base, monad-control, mtl
@@ -104481,6 +105306,8 @@ self: {
        pname = "ip6addr";
        version = "0.5.2";
        sha256 = "ad460bf7d2765aa050968154188ba51a1b8483b6a27b179042528058b0e9549f";
+       revision = "1";
+       editedCabalFile = "f59669c0e8198ef3c56ecff75b7304d379fc1bbd5485114e3be6774d0d07037c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs IPv6Addr text ];
@@ -104732,6 +105559,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-conduit_0_2_2_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
+     , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
+     , time, tls, transformers, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-conduit";
+       version = "0.2.2.0";
+       sha256 = "b66e058a66e9cd782f065be6b100bb80157c55d733db6691112a70e9aab13065";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra connection irc irc-ctcp
+         network-conduit-tls profunctors text time tls transformers
+         x509-validation
+       ];
+       homepage = "https://github.com/barrucadu/irc-conduit";
+       description = "Streaming IRC message library using conduits";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-core" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
      , hashable, HUnit, primitive, text, time, vector
@@ -105674,6 +106521,8 @@ self: {
        pname = "ixmonad";
        version = "0.57";
        sha256 = "f354ef7938e3e5d91dd0af3d422081ca78c396f0063f2dc97a864b73537718cd";
+       revision = "1";
+       editedCabalFile = "589fe683da9065a906b2f156d8335050fc9de4c1514a6582c88a0d12c3c68b18";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
@@ -106263,8 +107112,8 @@ self: {
      }:
      mkDerivation {
        pname = "jni";
-       version = "0.2.2";
-       sha256 = "67c1dc21d8f8a3d85e7b4ced2834d1bac4857e9102bb39f3c9d78618c1e72ea4";
+       version = "0.2.3";
+       sha256 = "ba48cfc823de07255421301a02248043bccaf8201d1bc6a7956b86f6c972c904";
        libraryHaskellDepends = [
          base bytestring containers inline-c singletons thread-local-storage
        ];
@@ -106577,8 +107426,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-warp";
-       version = "0.8.0.0";
-       sha256 = "468f4748bdbeb8cf86054ef61260152ce0ef41c23cd2f10d9bb50dbe8732ba50";
+       version = "0.8.2.0";
+       sha256 = "e9616e7bedb12c1b37ab1e82c065d7b6de6f341ec4cb01748e623a583c834f11";
        libraryHaskellDepends = [
          aeson base containers http-types jsaddle stm text time transformers
          wai wai-websockets warp websockets
@@ -106599,8 +107448,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkit2gtk";
-       version = "0.8.1.0";
-       sha256 = "f21e613da36ad510fce1d609eef6a966e11da97a35bdf81ce7924bca56729da6";
+       version = "0.8.2.1";
+       sha256 = "01cf836ba8aa03d4d2cba539156ac0051c651fc7ec77b53eb20a41b3b445a606";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-gio gi-glib gi-gtk
          gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix
@@ -106618,8 +107467,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkitgtk";
-       version = "0.8.1.0";
-       sha256 = "baa5ecd99c21046cbe5fe2126d4b072a12419aaf03eb1adf8b97b620c7760437";
+       version = "0.8.2.1";
+       sha256 = "e4cfcdf07d34f5b8fb00c747097830c9338e9f0c43c9a69bad10511e72ff2132";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore
          gi-webkit haskell-gi-base jsaddle text unix
@@ -106634,8 +107483,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, jsaddle }:
      mkDerivation {
        pname = "jsaddle-wkwebview";
-       version = "0.8.1.0";
-       sha256 = "10371cdff510c0229a34def4038e9d8e9e796d0a891b2a424b0e8a05b481d3a0";
+       version = "0.8.2.0";
+       sha256 = "aa7968119b68ed7166482f2bfb217e942fbd2ead932fc2f349894fa149d2dfb6";
        libraryHaskellDepends = [ aeson base bytestring jsaddle ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -107943,8 +108792,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1";
-       revision = "8";
-       editedCabalFile = "d35522fe047447685a0028216de02d88ddd4706fe025bb1266ffda61df31a988";
+       revision = "9";
+       editedCabalFile = "6b788670bd0b22096693d6fca5770c5522bc3c89c9ca12123034f7957172a38a";
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -109597,18 +110446,20 @@ self: {
      }) {};
 
   "lambda-calculator" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, parsec, Shellac
-     , Shellac-readline
+    ({ mkDerivation, base, hlint, hspec, HUnit, optparse-applicative
+     , parsec, Shellac, Shellac-readline
      }:
      mkDerivation {
        pname = "lambda-calculator";
-       version = "1.0.0";
-       sha256 = "c0010570a3f90cd6eb74b36e6787eb19a01f49005fe24de72ca957406909dc86";
+       version = "1.1.1";
+       sha256 = "9dec187ddefcf7276e845a50f3dc74a61ab4347c196d8f8165b1ddfa2f2dcc84";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec ];
-       executableHaskellDepends = [ base Shellac Shellac-readline ];
-       testHaskellDepends = [ base hspec HUnit ];
+       executableHaskellDepends = [
+         base optparse-applicative Shellac Shellac-readline
+       ];
+       testHaskellDepends = [ base hlint hspec HUnit ];
        homepage = "https://github.com/sgillespie/lambda-calculus#readme";
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
@@ -109658,8 +110509,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, read-bounded }:
      mkDerivation {
        pname = "lambda-options";
-       version = "0.9.0.0";
-       sha256 = "440852153cc682a7eb056b71713ea299329acbaeab8ecd5a422b89ebc831e976";
+       version = "0.9.0.1";
+       sha256 = "50684829a88a83492caa34eeddce64bb33fed56dad683f8454ddb03afbd4049b";
        libraryHaskellDepends = [ base containers mtl read-bounded ];
        homepage = "https://github.com/thomaseding/lambda-options";
        description = "A modern command-line parser for Haskell";
@@ -111974,8 +112825,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.8.0.1";
-       sha256 = "5756a0ca948e17db7d6d5a904e2e444c9f0e74108e2a5ed139453a650e84f7f7";
+       version = "0.8.0.3";
+       sha256 = "eaa865b6ded7ecb0110298a61a5768fce49e3ef270e5a45db6a0cc2d2a7ba166";
        libraryHaskellDepends = [
          aeson attoparsec base binary binary-conduit bytestring
          canteven-http conduit conduit-extra containers data-default-class
@@ -111992,26 +112843,27 @@ self: {
   "legion-discovery" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal
      , canteven-http, canteven-log, conduit, containers
-     , data-default-class, graphviz, http-types, legion, legion-extra
-     , monad-logger, scotty, scotty-format, scotty-resource, SHA, text
-     , time, transformers, wai, wai-extra, warp
+     , data-default-class, ekg, graphviz, http-types, legion
+     , legion-extra, monad-logger, scotty, scotty-format
+     , scotty-resource, SHA, text, time, transformers, wai, wai-extra
+     , warp
      }:
      mkDerivation {
        pname = "legion-discovery";
-       version = "0.2.2.1";
-       sha256 = "5338e9ffb14ced8f1ec8bde7c9138e769ef643da8930937fc79cdbac970d6096";
+       version = "0.3.0.0";
+       sha256 = "a5bcbbcaec065c4f833b51c05e0379bce3e1f22ca70585b63878ef57dbabfc61";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring Cabal canteven-http
-         canteven-log conduit containers data-default-class graphviz
+         canteven-log conduit containers data-default-class ekg graphviz
          http-types legion legion-extra monad-logger scotty scotty-format
          scotty-resource SHA text time transformers wai wai-extra warp
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/owensmurray/legion-discovery#readme";
-       description = "Initial project template from stack";
+       description = "A discovery service based on Legion";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -112019,15 +112871,16 @@ self: {
   "legion-discovery-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , data-default-class, http-client, http-types, load-balancing
-     , network, text
+     , network, resourcet, text, transformers
      }:
      mkDerivation {
        pname = "legion-discovery-client";
-       version = "0.1.0.2";
-       sha256 = "d9f8b1f24d90b3711ec81555c21e722280bcb59914c2341bb89e21f9b699dd5d";
+       version = "0.1.0.3";
+       sha256 = "4fd1c98dcade6f1251418f14537df3cffb4af814eca8074f7a06e0efdd67189b";
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers data-default-class
-         http-client http-types load-balancing network text
+         http-client http-types load-balancing network resourcet text
+         transformers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/owensmurray/legion-discovery-client#readme";
@@ -112501,8 +113354,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "1.0.6.0";
-       sha256 = "9a55ddd34f6e41ba274fa1b303262dc883868ffcb0e24810b432441e5ebe220a";
+       version = "1.0.7.0";
+       sha256 = "582a1191b8ac60a4a50fa9361a48f0fe58686ab94db7dbc13bee07e57a20e615";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -117163,6 +118016,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lz4-conduit" = callPackage
+    ({ mkDerivation, base, binary, bytestring, bytestring-arbitrary
+     , conduit, conduit-extra, mtl, QuickCheck, resourcet
+     }:
+     mkDerivation {
+       pname = "lz4-conduit";
+       version = "0.2";
+       sha256 = "7586c2a0c1a4355ea44c069eb19a5c23cdb9c94034fd182e31d638a43a1bf4a3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring conduit mtl resourcet
+       ];
+       executableHaskellDepends = [
+         base conduit conduit-extra resourcet
+       ];
+       testHaskellDepends = [
+         base bytestring bytestring-arbitrary conduit QuickCheck resourcet
+       ];
+       homepage = "https://github.com/bigmac2k/lz4-conduit";
+       description = "LZ4 compression for conduits";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lzma" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
@@ -117261,6 +118138,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mDNSResponder-client" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, ctrie, data-endian
+     , network, network-msg, transformers
+     }:
+     mkDerivation {
+       pname = "mDNSResponder-client";
+       version = "1.0.1";
+       sha256 = "205820b45d91f0459fa3a810bfdb5691249d3275e95abf9d75aec69e2285e1c8";
+       libraryHaskellDepends = [
+         base bytestring ctrie data-endian network network-msg transformers
+       ];
+       testHaskellDepends = [ base bytestring Cabal ];
+       homepage = "https://github.com/obsidiansystems/mDNSResponder-client";
+       description = "Library for talking to the mDNSResponder daemon";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "maam" = callPackage
     ({ mkDerivation, base, containers, template-haskell, text, vector
      }:
@@ -118227,7 +119121,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "mandrill_0_5_3_0" = callPackage
+  "mandrill_0_5_3_1" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, containers, email-validate, http-client
      , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
@@ -118236,8 +119130,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.5.3.0";
-       sha256 = "b022383dfbae3b6281a216924f508d9651849250a6dcadcedc9c30465fc5160d";
+       version = "0.5.3.1";
+       sha256 = "a559a166232461520f4fbb0637db9f922a82fdff819e9e35ee7b0941a7c0c315";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -118740,6 +119634,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "marvin-interpolate" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, hspec, mtl, parsec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "marvin-interpolate";
+       version = "0.3.0";
+       sha256 = "053a9fa6ada9b29a18d8e6d7da51b9ee4bc440cd53c6882eb6dc05f425022d85";
+       libraryHaskellDepends = [
+         base haskell-src-meta mtl parsec template-haskell text
+       ];
+       testHaskellDepends = [ base hspec text ];
+       homepage = "http://marvin.readthedocs.io/en/latest/interpolation.html";
+       description = "Compile time string interpolation a la Scala and CoffeeScript";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "marxup" = callPackage
     ({ mkDerivation, base, configurator, containers, directory, dlist
      , filepath, haskell-src-exts, labeled-tree, lens, lp-diagrams, mtl
@@ -120156,6 +121067,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "metrics_0_4_0_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , HUnit, lens, mwc-random, primitive, QuickCheck, text, time
+     , transformers, transformers-base, unix-compat
+     , unordered-containers, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "metrics";
+       version = "0.4.0.1";
+       sha256 = "db18eddaa43b81c33c925bf467010e5b9088d55fe5d7b364466a3459543cc7e7";
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring containers lens mwc-random primitive
+         text time transformers transformers-base unix-compat
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         async base HUnit lens mwc-random primitive QuickCheck
+       ];
+       description = "High-performance application metric tracking";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "metricsd-client" = callPackage
     ({ mkDerivation, base, network }:
      mkDerivation {
@@ -120343,6 +121277,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "microlens-aeson_2_1_1_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
+     , scientific, tasty, tasty-hunit, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "microlens-aeson";
+       version = "2.1.1.2";
+       sha256 = "f1295f2b6b4db3118b445551ae585650e9ddb2d40bd50194514e478710840f79";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring microlens scientific text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring microlens tasty tasty-hunit text
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/fosskers/microlens-aeson/";
+       description = "Law-abiding lenses for Aeson, using microlens";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-contra" = callPackage
     ({ mkDerivation, base, contravariant, microlens }:
      mkDerivation {
@@ -120431,6 +121388,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-th_0_4_1_1" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.4.1.1";
+       sha256 = "5b1a400db8577805d80fb83963ef2a41cf43023b38300fdeaacb01a4fb526a7b";
+       libraryHaskellDepends = [
+         base containers microlens template-haskell
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Automatic generation of record lenses for microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "micrologger" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, text, text-format
      , time, transformers
@@ -125428,7 +126400,6 @@ self: {
        homepage = "https://github.com/paul-rouse/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
@@ -125938,8 +126909,8 @@ self: {
      }:
      mkDerivation {
        pname = "nanovg";
-       version = "0.5.1.0";
-       sha256 = "2e76eaf2b3814d5651a6c13bea84c561d416d0138303cd3826ed89a399c6e437";
+       version = "0.5.2.0";
+       sha256 = "22e31d227770e55123aadb2750c35895f4d635327c7be1ef1ea2655d86180f5d";
        libraryHaskellDepends = [ base bytestring containers text vector ];
        librarySystemDepends = [ freeglut GLEW mesa ];
        libraryToolDepends = [ c2hs ];
@@ -126049,8 +127020,8 @@ self: {
      }:
      mkDerivation {
        pname = "nats-queue";
-       version = "0.1.2.1";
-       sha256 = "278abe19802ac26b2a720ad9bab84c9ce74f348eabff55ee96e67286f5453ca3";
+       version = "0.1.2.2";
+       sha256 = "f2b59d789feb12d0192a63227b5a114a353c21214276f3478474c561a0b9f5ed";
        libraryHaskellDepends = [
          aeson async base bytestring containers dequeue network network-uri
          random text
@@ -126610,6 +127581,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "netease-fm" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, brick
+     , bytestring, containers, cryptonite, data-default-class, directory
+     , exceptions, http-client, http-client-tls, http-types, memory, mtl
+     , parsec, process, random, stm, text, time, transformers, vector
+     , vty
+     }:
+     mkDerivation {
+       pname = "netease-fm";
+       version = "1.2.2";
+       sha256 = "a9052877b00ae471603960e2043302ceb9dfc4ca0f64550966de0ab10053aab6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring cryptonite
+         data-default-class directory exceptions http-client http-client-tls
+         http-types memory mtl parsec process random stm text time
+         transformers vector
+       ];
+       executableHaskellDepends = [
+         base brick containers data-default-class directory mtl process
+         random stm transformers vty
+       ];
+       homepage = "http://github.com/foreverbell/netease-fm#readme";
+       description = "NetEase Cloud Music FM client in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "netlines" = callPackage
     ({ mkDerivation, base, bytestring, contstuff, enumerator, HTF
      , random, text, time
@@ -127862,6 +128861,55 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "neural-network-base" = callPackage
+    ({ mkDerivation, base, constraints }:
+     mkDerivation {
+       pname = "neural-network-base";
+       version = "0.1.0.0";
+       sha256 = "6dd5e69d4e1c74f4df8a541f58051c14338b7fe7e95d41ca1b7cca58f1f0afde";
+       libraryHaskellDepends = [ base constraints ];
+       homepage = "https://github.com/pierric/neural-network";
+       description = "Yet Another High Performance and Extendable Neural Network in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "neural-network-blashs" = callPackage
+    ({ mkDerivation, base, blas-hs, constraints, ghc-prim, hmatrix
+     , hspec, mtl, mwc-random, neural-network-base, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "neural-network-blashs";
+       version = "0.1.0.0";
+       sha256 = "a597ce92cbae408fbe1154da0d98b515108c4c6d8973900697b242323691d40a";
+       libraryHaskellDepends = [
+         base blas-hs constraints ghc-prim mtl mwc-random
+         neural-network-base vector
+       ];
+       testHaskellDepends = [
+         base blas-hs hmatrix hspec neural-network-base QuickCheck vector
+       ];
+       homepage = "https://github.com/pierric/neural-network";
+       description = "Yet Another High Performance and Extendable Neural Network in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "neural-network-hmatrix" = callPackage
+    ({ mkDerivation, base, blas, deepseq, hmatrix, hmatrix-gsl, mtl
+     , mwc-random, neural-network-base, parallel, vector
+     }:
+     mkDerivation {
+       pname = "neural-network-hmatrix";
+       version = "0.1.0.0";
+       sha256 = "b4db8f621dcabd8aa6dbd4828b7a682fb2af0856c8669b3bd1f8db8214944861";
+       libraryHaskellDepends = [
+         base deepseq hmatrix hmatrix-gsl mtl mwc-random neural-network-base
+         parallel vector
+       ];
+       librarySystemDepends = [ blas ];
+       description = "Yet Another High Performance and Extendable Neural Network in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) blas;};
+
   "newports" = callPackage
     ({ mkDerivation, base, directory, old-time }:
      mkDerivation {
@@ -129503,15 +130551,17 @@ self: {
      }) {};
 
   "obdd" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, process, random }:
+    ({ mkDerivation, array, base, containers, ersatz, mtl
+     , process-extras, random, text
+     }:
      mkDerivation {
        pname = "obdd";
-       version = "0.6.1";
-       sha256 = "0db47df8588a5ffd6a925cf4d21c3e313aac9ec8ced2461dfddbfafb38ba1053";
+       version = "0.8.1";
+       sha256 = "424ea2a11af22e0fe640b66af177b355024acabf99a1ee63d27b16e3355e8e11";
        libraryHaskellDepends = [
-         array base containers mtl process random
+         array base containers ersatz mtl process-extras random text
        ];
-       testHaskellDepends = [ array base containers ];
+       testHaskellDepends = [ array base containers text ];
        homepage = "https://github.com/jwaldmann/haskell-obdd";
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
@@ -129640,15 +130690,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "octane_0_18_1" = callPackage
+  "octane_0_18_2" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
      , overloaded-records, rattletrap, text
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.18.1";
-       sha256 = "0531b90b093b4e89f183801cdf7c4220adf7c118d90aba00db2968d3e0b7604b";
+       version = "0.18.2";
+       sha256 = "4fcd5e5f2b01eee2e382bdf701617129500cce1d4302fa265d52c15edcfa34a0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130114,13 +131164,15 @@ self: {
      }) {};
 
   "one-liner" = callPackage
-    ({ mkDerivation, base, contravariant, ghc-prim, transformers }:
+    ({ mkDerivation, base, contravariant, ghc-prim, profunctors
+     , transformers
+     }:
      mkDerivation {
        pname = "one-liner";
-       version = "0.5.2";
-       sha256 = "9b2332118fd4e8ce127b11989b73af2a9812c98bbf1e2dfa762c718561b6df79";
+       version = "0.6";
+       sha256 = "40b4ed5de04d7f32a1297c33eedc971abd0652c156cfb89172fbeccdeda1e17f";
        libraryHaskellDepends = [
-         base contravariant ghc-prim transformers
+         base contravariant ghc-prim profunctors transformers
        ];
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
@@ -131505,13 +132557,13 @@ self: {
      }:
      mkDerivation {
        pname = "order-maintenance";
-       version = "0.1.1.1";
-       sha256 = "9b00674ed6902afcc455a1a2fce9c1b919a4c3b5ef5ec299726447137a25934c";
+       version = "0.2.1.0";
+       sha256 = "c959d8aa67f1cf47e15adfe650ba864f590deef451485e2048ebbe64a77a4b39";
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck transformers
        ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance";
+       homepage = "http://hackage.haskell.org/package/order-maintenance";
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131861,6 +132913,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "overload" = callPackage
+    ({ mkDerivation, base, simple-effects, template-haskell }:
+     mkDerivation {
+       pname = "overload";
+       version = "0.1.0.0";
+       sha256 = "ed48aa71ec612bb280529f26e94f0babe5ca346be3bf0a2cbd34a22d25308322";
+       libraryHaskellDepends = [ base simple-effects template-haskell ];
+       homepage = "https://gitlab.com/LukaHorvat/overload";
+       description = "Finite overloading";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "overloaded-records" = callPackage
     ({ mkDerivation, base, data-default-class, HUnit, template-haskell
      , test-framework, test-framework-hunit
@@ -132355,8 +133419,8 @@ self: {
        pname = "pandoc";
        version = "1.19.1";
        sha256 = "9d22db0a1536de0984f4a605f1a28649e68d540e6d892947d9644987ecc4172a";
-       revision = "1";
-       editedCabalFile = "6db38c75bdb36377e1424b91b2662205dbe54152995a08ab83127bfb17ee027b";
+       revision = "2";
+       editedCabalFile = "6282ee80ee941d2c5582eb81a0c269df6e0d9267912fc85f00b40b5ec35a472c";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -132400,6 +133464,8 @@ self: {
        pname = "pandoc-citeproc";
        version = "0.10.3";
        sha256 = "2f6233ff91a9fb08edfb0ac2b4ec40729d87590a7c557d0452674dd3c7df4d58";
+       revision = "1";
+       editedCabalFile = "aacaeb9d3fbf64d0bf21ff2f7cd6becc58160c9bcf2923431fe78d19eaf1aeb3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132623,6 +133689,8 @@ self: {
        pname = "pandoc-types";
        version = "1.17.0.4";
        sha256 = "531996e547714e34a2e4134e9e80dad9929bbc6814ebb5515f95538fa76c3f74";
+       revision = "1";
+       editedCabalFile = "9ede2044ebbf4fbb7e8244d7f458988178d7bad81e566e8c8a2bc1793ee3d27d";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -132847,6 +133915,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "paphragen" = callPackage
+    ({ mkDerivation, base, bytestring, containers }:
+     mkDerivation {
+       pname = "paphragen";
+       version = "0.2.0.0";
+       sha256 = "b892b2e8cbeafe41b8c7dcdfd39c46c5049c99f02ccd3ff6dfb09d623a58fc7e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base bytestring containers ];
+       description = "A passphrase generator";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "papillon" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, monads-tf
      , template-haskell, transformers
@@ -133862,6 +134943,8 @@ self: {
        pname = "path-io";
        version = "1.2.0";
        sha256 = "cb8bfb9fca81eb0f0f9b81761cc5a6edc61204e2c630f7277173147cf149336f";
+       revision = "1";
+       editedCabalFile = "bf7a036207155e1b752828736f43541ad0c20a5e780cd17fdec823a5be07da83";
        libraryHaskellDepends = [
          base containers directory exceptions filepath path temporary time
          transformers unix-compat
@@ -133872,6 +134955,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path-io_1_2_1" = callPackage
+    ({ mkDerivation, base, containers, directory, exceptions, filepath
+     , hspec, path, temporary, time, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "1.2.1";
+       sha256 = "41582c65c6ceb05522bbacb0fc242f542d1e42e61bc5c9858b9153e8c334339f";
+       libraryHaskellDepends = [
+         base containers directory exceptions filepath path temporary time
+         transformers unix-compat
+       ];
+       testHaskellDepends = [ base exceptions hspec path unix-compat ];
+       homepage = "https://github.com/mrkkrp/path-io";
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-pieces" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -134055,6 +135157,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "paypal-rest-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, country-codes
+     , Decimal, http-client, http-types, lens, safe, text, time, wreq
+     }:
+     mkDerivation {
+       pname = "paypal-rest-client";
+       version = "0.1.0";
+       sha256 = "a39bac4d5929b4fa26f41698d252edd2ae584d1191746dafa65a84cf15ef01d9";
+       libraryHaskellDepends = [
+         aeson base bytestring containers country-codes Decimal http-client
+         http-types lens safe text time wreq
+       ];
+       homepage = "https://github.com/meoblast001/paypal-rest-client";
+       description = "A client to connect to PayPal's REST API (v1)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pb" = callPackage
     ({ mkDerivation, base, containers, HTTP, network, process }:
      mkDerivation {
@@ -134277,15 +135396,13 @@ self: {
   "pdf-slave" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , containers, exceptions, haskintex, HaTeX, optparse-applicative
-     , pdf-slave-template, shelly, system-filepath, text
+     , pdf-slave-template, shelly, system-filepath, text, transformers
      , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "pdf-slave";
-       version = "1.2.0.0";
-       sha256 = "bf45cd593271427ab6f72dffaa1e355a33b59ab20d18a34590a3a1c50d5fe029";
-       revision = "1";
-       editedCabalFile = "cf72f50463292710ceb929edc7cb9e61c41c5da36676e5d0cc7e7cc5d0dd23a4";
+       version = "1.2.3.0";
+       sha256 = "46700a44e9f6ee7fbfecfd23201211a9c99d3a74c9fa9d8a467980b7390a5ae4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134295,7 +135412,7 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base bytestring optparse-applicative pdf-slave-template
-         shelly system-filepath text yaml
+         shelly system-filepath text transformers yaml
        ];
        homepage = "https://github.com/NCrashed/pdf-slave#readme";
        description = "Tool to generate PDF from haskintex templates and YAML input";
@@ -134577,8 +135694,8 @@ self: {
      }:
      mkDerivation {
        pname = "pell";
-       version = "0.1.0.0";
-       sha256 = "addb0a4330e748f2d7fe4305acf7af5344f437208a90d6c7a637820679a4af6b";
+       version = "0.1.1.0";
+       sha256 = "5e2002920c97bddbe3047dbc2eba3ddadd3823c4ca137c4a1d3314cb12dc4ad4";
        libraryHaskellDepends = [ arithmoi base containers ];
        testHaskellDepends = [
          arithmoi base Cabal cabal-test-quickcheck containers primes
@@ -135377,8 +136494,8 @@ self: {
        pname = "persistent-template";
        version = "2.5.1.6";
        sha256 = "f88a8735173ba197f8d698a9c1fd5c649234fd60efe493f401432926a55e7b44";
-       revision = "1";
-       editedCabalFile = "85aabe4c402cc78cc71100fd9dc51b84c9e3cd6370c73983ee31a93dc73482ce";
+       revision = "2";
+       editedCabalFile = "18eae1801d9742facf54aada319dfde737a1cc758b39bb2f237a4d15c98b65c6";
        libraryHaskellDepends = [
          aeson aeson-compat base bytestring containers ghc-prim
          http-api-data monad-control monad-logger path-pieces persistent
@@ -135611,19 +136728,17 @@ self: {
      }) {};
 
   "pg-store" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, hspec, mtl
-     , postgresql-libpq, QuickCheck, template-haskell, text, time
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , haskell-src-meta, mtl, postgresql-libpq, scientific
+     , template-haskell, text, time
      }:
      mkDerivation {
        pname = "pg-store";
-       version = "0.1.1";
-       sha256 = "5f8d688811e4e59accce33f43fe2168adb9a4809b794d6e27db028af605298af";
+       version = "0.2";
+       sha256 = "4824fbff41eb4dce8944afca1c3fac8716d77c4425ca04c1d8546876b51c83b6";
        libraryHaskellDepends = [
-         attoparsec base bytestring mtl postgresql-libpq template-haskell
-         text time
-       ];
-       testHaskellDepends = [
-         base bytestring hspec mtl postgresql-libpq QuickCheck text
+         aeson attoparsec base blaze-builder bytestring haskell-src-meta mtl
+         postgresql-libpq scientific template-haskell text time
        ];
        homepage = "https://github.com/vapourismo/pg-store";
        description = "Simple storage interface to PostgreSQL";
@@ -136110,8 +137225,10 @@ self: {
      }:
      mkDerivation {
        pname = "picologic";
-       version = "0.2.0";
-       sha256 = "eb831c0e385a43966849d75194418ac2823d2fad54cefc0eb29771e04d6c4e03";
+       version = "0.3.0";
+       sha256 = "130f67f8d018b4f988d434d37fa46d908d4d144ccbd005cfd2773a720ba25e4b";
+       revision = "1";
+       editedCabalFile = "e89ef8a03720c391eefc8a47c6f947a1b7f4a37762393f45923854e696fcb59b";
        libraryHaskellDepends = [
          base containers mtl parsec picosat pretty
        ];
@@ -136149,12 +137266,13 @@ self: {
      }) {};
 
   "picosat" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers, random, rdtsc, transformers }:
      mkDerivation {
        pname = "picosat";
-       version = "0.1.3";
-       sha256 = "374d64964bbb35d24bbc3908d9de38f0087d425b6f7ab90c88f870b865564fd2";
-       libraryHaskellDepends = [ base ];
+       version = "0.1.4";
+       sha256 = "5a6d9fae04a77a95a8c92ec6dd76302010b726d8c934dc8d8bbabc82851e9039";
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [ base containers random rdtsc transformers ];
        homepage = "https://github.com/sdiehl/haskell-picosat";
        description = "Bindings to the PicoSAT solver";
        license = stdenv.lib.licenses.mit;
@@ -136386,8 +137504,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-async";
-       version = "0.1.1";
-       sha256 = "e22358175e3c2c8f16bf17842e63e891931e792c3aafd2167bfc39baac1b14ac";
+       version = "0.1.2";
+       sha256 = "ec0ee9cfb5b958acd40f5fd7ba2073853eccc7c2701a14fc011118f3ee95d83d";
        libraryHaskellDepends = [
          base lifted-async lifted-base monad-control pipes pipes-safe stm
          transformers-base
@@ -137550,8 +138668,8 @@ self: {
      }:
      mkDerivation {
        pname = "plan-applicative";
-       version = "1.0.0.0";
-       sha256 = "911a0d6f69d2dd4c7642abc855c153d90f799035a722324965506ecb2f954dd7";
+       version = "2.0.0.1";
+       sha256 = "f350d72c315617d57f0747a108ab99f20daf6c960f80b7025687bf9fd5a9d758";
        libraryHaskellDepends = [
          base bifunctors comonad containers profunctors streaming
          transformers
@@ -139745,8 +140863,8 @@ self: {
      }:
      mkDerivation {
        pname = "praglude";
-       version = "0.3.0.0";
-       sha256 = "8c5c2cdbff18b89b61b28680d92ad9c8204abcf9ef264b5b4622f1ee21f744da";
+       version = "0.4.0.1";
+       sha256 = "70996dbad7defd09b26ad792150205f878c6158a372cc2544ea1bfd7d2a74dec";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring casing containers
          data-default deepseq directory filepath hashable lens mtl random
@@ -139766,8 +140884,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.13";
-       sha256 = "12d47c88d2ea714d58cd4527fb2826d49e2b5d49bc3d8dda8f6fd52bd4dd830a";
+       version = "0.0.14";
+       sha256 = "6b01da606303e72bad6055d436e1c199ad58bb6c93efd89b8d4c43ad5aa6ff21";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141864,6 +142982,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "protolude-lifted" = callPackage
+    ({ mkDerivation, base, lifted-async, lifted-base, protolude }:
+     mkDerivation {
+       pname = "protolude-lifted";
+       version = "0.1.0.1";
+       sha256 = "1cf719477b66ad04fca3c5322fc3e9b27d6208bf677cbab84b4577cdce83364f";
+       libraryHaskellDepends = [
+         base lifted-async lifted-base protolude
+       ];
+       homepage = "https://github.com/pbogdan/protolude-lifted";
+       description = "Protolude with lifted-base and lifted-async";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "proton-haskell" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, HUnit
      , test-framework, test-framework-hunit
@@ -142594,7 +143726,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "purescript_0_10_3" = callPackage
+  "purescript_0_10_5" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty
      , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json
      , boxes, bytestring, clock, containers, data-ordlist, directory
@@ -142603,18 +143735,16 @@ self: {
      , language-javascript, lens, lifted-base, monad-control
      , monad-logger, mtl, network, optparse-applicative, parallel
      , parsec, pattern-arrows, pipes, pipes-http, process, protolude
-     , regex-tdfa, safe, semigroups, silently, sourcemap, spdx, split
-     , stm, syb, system-filepath, text, time, transformers
+     , regex-tdfa, safe, scientific, semigroups, silently, sourcemap
+     , spdx, split, stm, syb, system-filepath, text, time, transformers
      , transformers-base, transformers-compat, turtle
      , unordered-containers, utf8-string, vector, wai, wai-websockets
      , warp, websockets
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.10.3";
-       sha256 = "261e2afde8bf1d58a9c9c23296b37b57dfcd47d4f25cc7798a36a6e73978c5c2";
-       revision = "2";
-       editedCabalFile = "cd4a6818028652cb5c630372f872072197ef5822edf1814eaf8cd672c75683b7";
+       version = "0.10.5";
+       sha256 = "0d36361819866efe703eb3ae37f597316098ec3ead6edc9236ea63d54bdc8916";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142623,23 +143753,24 @@ self: {
          edit-distance filepath fsnotify Glob haskeline http-client
          http-types language-javascript lens lifted-base monad-control
          monad-logger mtl parallel parsec pattern-arrows pipes pipes-http
-         process protolude regex-tdfa safe semigroups sourcemap spdx split
-         stm syb text time transformers transformers-base
+         process protolude regex-tdfa safe scientific semigroups sourcemap
+         spdx split stm syb text time transformers transformers-base
          transformers-compat unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat
          boxes bytestring containers directory file-embed filepath foldl
          Glob haskeline http-types monad-logger mtl network
-         optparse-applicative parsec process protolude split stm
+         optparse-applicative parsec process protolude sourcemap split stm
          system-filepath text time transformers transformers-compat turtle
          utf8-string wai wai-websockets warp websockets
        ];
        testHaskellDepends = [
-         aeson aeson-better-errors base base-compat boxes bytestring
-         containers directory filepath Glob haskeline hspec hspec-discover
-         HUnit mtl optparse-applicative parsec process protolude silently
-         stm text time transformers transformers-compat utf8-string vector
+         aeson aeson-better-errors base base-compat bower-json boxes
+         bytestring containers directory filepath Glob haskeline hspec
+         hspec-discover HUnit mtl optparse-applicative parsec process
+         protolude silently stm text time transformers transformers-compat
+         utf8-string vector
        ];
        doCheck = false;
        homepage = "http://www.purescript.org/";
@@ -142669,6 +143800,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "purescript-bridge_0_8_0_1" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
+     , mtl, text, transformers
+     }:
+     mkDerivation {
+       pname = "purescript-bridge";
+       version = "0.8.0.1";
+       sha256 = "ab3cf87f637053e0378ca266166e5699ae4acfb5f404dae9ac4a793890124329";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving lens mtl text
+         transformers
+       ];
+       testHaskellDepends = [
+         base containers hspec hspec-expectations-pretty-diff text
+       ];
+       description = "Generate PureScript data types from Haskell data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "purescript-bundle-fast" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , optparse-applicative, text, vector
@@ -142795,12 +143947,11 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.1.0.3";
-       sha256 = "7c70330d247624caaac8d2569735728a375d06a813ae1dc2a240707c4149caab";
+       version = "1.1.0.4";
+       sha256 = "7d52cf0d179e2585c82f1f223e9c6cedbc4c8d1489348d55ec89bc10f7087251";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptohash hashable
-         http-client http-types QuickCheck text time transformers
-         unordered-containers
+         http-client http-types text time transformers unordered-containers
        ];
        testHaskellDepends = [
          aeson base bytestring hspec http-client http-types QuickCheck text
@@ -143177,8 +144328,8 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "0.1.2.1";
-       sha256 = "72e1c72a7e3da7769401b4d1125b3f527274bdc5f97d78be2e14cf619d705d30";
+       version = "0.2.1.1";
+       sha256 = "e7abcdff646835141b8ea2c53ef414467ddc07afef20d2cce48aadc0096001f4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144022,8 +145173,8 @@ self: {
      }:
      mkDerivation {
        pname = "quipper";
-       version = "0.8.1";
-       sha256 = "69dad741fde6f2fb2d3c9497a93f6c31a90f1150205c2cc11c02455d501a2c8c";
+       version = "0.8.2";
+       sha256 = "c030e997cb6960b6125402c03e46d48e582b6eea28ffe9712c27a66366bd8f99";
        libraryHaskellDepends = [
          base containers directory easyrender mtl primes process random
          template-haskell unix
@@ -144990,6 +146141,180 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rapid-term" = callPackage
+    ({ mkDerivation, ansi-terminal, base, clock, kan-extensions
+     , process, transformers, unix
+     }:
+     mkDerivation {
+       pname = "rapid-term";
+       version = "0.1.1";
+       sha256 = "49cb96ef27649b3caf9fbac4a293f03ac884dd1ed0e96a3f0b6749ad1e8ed1a0";
+       libraryHaskellDepends = [
+         ansi-terminal base clock kan-extensions process transformers unix
+       ];
+       homepage = "https://github.com/esoeylemez/rapid-term";
+       description = "External terminal support for rapid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "rasa" = callPackage
+    ({ mkDerivation, async, base, containers, data-default, lens, mtl
+     , text, text-lens, transformers, yi-rope
+     }:
+     mkDerivation {
+       pname = "rasa";
+       version = "0.1.3";
+       sha256 = "2247542b18000d21309747e55b65ccb6207dace606ad7e84166c46b7966caed1";
+       revision = "1";
+       editedCabalFile = "3677de9868bb117c8aa7845db9cbe0c614a8ec41e0f24efc50ccaff3963422db";
+       libraryHaskellDepends = [
+         async base containers data-default lens mtl text text-lens
+         transformers yi-rope
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa#readme";
+       description = "A modular text editor";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-example-config" = callPackage
+    ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-cursors
+     , rasa-ext-files, rasa-ext-logger, rasa-ext-slate
+     , rasa-ext-status-bar, rasa-ext-style, rasa-ext-vim
+     }:
+     mkDerivation {
+       pname = "rasa-example-config";
+       version = "0.1.0.0";
+       sha256 = "5d3cbf04bb2b7a18bfc0ecc03d3c6ed72a23c45827291537d34938fdde21821a";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-logger
+         rasa-ext-slate rasa-ext-status-bar rasa-ext-style rasa-ext-vim
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Example user config for Rasa";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-cmd" = callPackage
+    ({ mkDerivation, base, containers, data-default, lens, rasa, text
+     }:
+     mkDerivation {
+       pname = "rasa-ext-cmd";
+       version = "0.1.0.0";
+       sha256 = "91efb87afe1a4c9d610c450742f623ff1170957327856ef4265754e1ed4d8123";
+       libraryHaskellDepends = [
+         base containers data-default lens rasa text
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for running commands";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-cursors" = callPackage
+    ({ mkDerivation, base, data-default, lens, mtl, rasa
+     , rasa-ext-style, text, text-lens, yi-rope
+     }:
+     mkDerivation {
+       pname = "rasa-ext-cursors";
+       version = "0.1.0.0";
+       sha256 = "3d53163dcf3b5d1f897f0c006f83a1ea71306dad3ed2fefc4f7af21a2ff7fda6";
+       libraryHaskellDepends = [
+         base data-default lens mtl rasa rasa-ext-style text text-lens
+         yi-rope
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext adding cursor(s)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-files" = callPackage
+    ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-cmd
+     , rasa-ext-status-bar, text
+     }:
+     mkDerivation {
+       pname = "rasa-ext-files";
+       version = "0.1.0.0";
+       sha256 = "9bfc3d47df893b23e4259887f95078b81fc9bfb489d9ce96d232f4ecdb39c3a4";
+       libraryHaskellDepends = [
+         base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar text
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for filesystem actions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-logger" = callPackage
+    ({ mkDerivation, base, lens, mtl, rasa }:
+     mkDerivation {
+       pname = "rasa-ext-logger";
+       version = "0.1.0.0";
+       sha256 = "4d951f1c54328715c3e923c1f89c833f687bb291e4d7af1ac563c77d8606e3e0";
+       libraryHaskellDepends = [ base lens mtl rasa ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for logging state/actions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-slate" = callPackage
+    ({ mkDerivation, base, lens, rasa, rasa-ext-logger
+     , rasa-ext-status-bar, rasa-ext-style, text, vty, yi-rope
+     }:
+     mkDerivation {
+       pname = "rasa-ext-slate";
+       version = "0.1.0.0";
+       sha256 = "75d5c973d41acc016e4f3aa87f0babfb2cfd0d979a848da6a6fb8c9d3c6e4eb9";
+       libraryHaskellDepends = [
+         base lens rasa rasa-ext-logger rasa-ext-status-bar rasa-ext-style
+         text vty yi-rope
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa extension for rendering to terminal with vty";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-status-bar" = callPackage
+    ({ mkDerivation, base, data-default, lens, rasa, text }:
+     mkDerivation {
+       pname = "rasa-ext-status-bar";
+       version = "0.1.0.0";
+       sha256 = "20791e8facaf3e452c1bdc60e8d519169f50a34213a8cdbd6503cb838c550c71";
+       libraryHaskellDepends = [ base data-default lens rasa text ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for populating status-bar";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-style" = callPackage
+    ({ mkDerivation, base, data-default, lens, rasa }:
+     mkDerivation {
+       pname = "rasa-ext-style";
+       version = "0.1.0.0";
+       sha256 = "496afd72cdbfca75bf530c022e5ad7bbcfd7878e1373ec497ec864a3e7beaee0";
+       libraryHaskellDepends = [ base data-default lens rasa ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext managing rendering styles";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "rasa-ext-vim" = callPackage
+    ({ mkDerivation, base, data-default, lens, mtl, rasa
+     , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar, text
+     , text-lens, yi-rope
+     }:
+     mkDerivation {
+       pname = "rasa-ext-vim";
+       version = "0.1.0.0";
+       sha256 = "3e936fe4fca11737f9983db671d2c94f240aa95d81d934b93e4d211575d8d045";
+       libraryHaskellDepends = [
+         base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
+         rasa-ext-status-bar text text-lens yi-rope
+       ];
+       homepage = "https://github.com/ChrisPenner/rasa/";
+       description = "Rasa Ext for vim bindings";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "rascal" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, containers, curl
      , curl-aeson, directory, filepath, HUnit, mtl, process, QuickCheck
@@ -145104,6 +146429,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_3_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-client, http-client-tls, http-types, tasty
+     , tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.3.2";
+       sha256 = "99b838c7d85208cd49fdf733d99ca29baafbb924f9db8a0d45ae88c15fc6ba73";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -145152,8 +146497,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "2.1.0";
-       sha256 = "d969cf852a2210f11a51f21b75f3c16a47a0dc92b695a6ae11c9287ddfe30588";
+       version = "2.1.3";
+       sha256 = "a349c7c6f45ab64c0ff85b877f99a7ec4d5a8946c0d2224b033b6014b518bea1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145856,8 +147201,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "read-bounded";
-       version = "0.1.1.0";
-       sha256 = "f310debaed6ede28440f1b177be6c5c6f281b7b3c0af9936bcb615d577d9d6a7";
+       version = "0.1.1.1";
+       sha256 = "fd9103522661982b366f89280e88c7ac8316eb6b892fa11a8645051da6859050";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/thomaseding/read-bounded";
        description = "Class for reading bounded values";
@@ -148501,12 +149846,13 @@ self: {
     ({ mkDerivation, base, containers, haskeline, mtl, process }:
      mkDerivation {
        pname = "repline";
-       version = "0.1.5.0";
-       sha256 = "9e807cf92d5f8a8e68787f6d93597bac41ace50997305105451bf852ce7ce3a4";
+       version = "0.1.6.0";
+       sha256 = "61f800cecd9f2d1545164384c827dc4d1e49ce870be8c4547b41f3ebc0902a5b";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers haskeline mtl ];
+       libraryHaskellDepends = [ base containers haskeline mtl process ];
        executableHaskellDepends = [ base containers mtl process ];
+       homepage = "https://github.com/sdiehl/repline";
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -148633,8 +149979,8 @@ self: {
        pname = "req";
        version = "0.1.0";
        sha256 = "c93bae94d0b640f0d459a3da79c6021f7d8403099e9f08c35a2cddf64eea2269";
-       revision = "1";
-       editedCabalFile = "03f0eb9f9ae76f17e56ff02d4e1f42769c323183497c81f0c0cb2c721e0eed2f";
+       revision = "2";
+       editedCabalFile = "c4d0fc2e312c85a8dc3e7aefb49341ad57662ac1dac6625304f9aa3cf2016160";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive connection
          data-default-class http-api-data http-client http-client-tls
@@ -150049,23 +151395,27 @@ self: {
      }) {};
 
   "rncryptor" = callPackage
-    ({ mkDerivation, base, bytestring, cipher-aes, io-streams, mtl
-     , pbkdf, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring
+     , bytestring-arbitrary, cryptonite, fastpbkdf2, io-streams, memory
+     , mtl, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+     , text
      }:
      mkDerivation {
        pname = "rncryptor";
-       version = "0.0.2.3";
-       sha256 = "465879f9e1209050820f939229ebea727d736071e46a19ea775aba8e0608e69f";
+       version = "0.3.0.0";
+       sha256 = "f7b14f165e0409f73d4ef257836199bcac7e4f7fca9ebfadf126f89a8c6de820";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring cipher-aes io-streams mtl pbkdf QuickCheck random
+         base bytestring cryptonite fastpbkdf2 io-streams memory mtl
+         QuickCheck random
        ];
        executableHaskellDepends = [
-         base bytestring cipher-aes io-streams
+         base bytestring cryptonite io-streams
        ];
        testHaskellDepends = [
-         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+         base base16-bytestring bytestring bytestring-arbitrary cryptonite
+         io-streams QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
@@ -152189,8 +153539,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.1.3";
-       sha256 = "1feff9aa39dc4bd34de1cb0da5fcf105429aafa1e28c97cfff19a44403c79951";
+       version = "2.1.5";
+       sha256 = "dd1ac555546ded3c178780c157d86d1075bd8a41f777bafffb9c94f9ef8a4f17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152799,6 +154149,8 @@ self: {
        pname = "scientific";
        version = "0.3.4.9";
        sha256 = "108330662b0af9a04d7da55864211ce12008efe36614d897ba635e80670918a8";
+       revision = "1";
+       editedCabalFile = "833f5960e622c7346c3c02547538da037bcc4eececc00ba2ab9412eabdb71d61";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq ghc-prim hashable
          integer-gmp text vector
@@ -152812,6 +154164,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_4_10" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , ghc-prim, hashable, integer-gmp, integer-logarithms, QuickCheck
+     , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.4.10";
+       sha256 = "4d3b8ae5d741facfb0e84a2f1b6964a7ab3817269568c37de44f1be5cc0ff1a1";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq ghc-prim hashable
+         integer-gmp integer-logarithms text vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       homepage = "https://github.com/basvandijk/scientific";
+       description = "Numbers represented using scientific notation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scion" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -152959,8 +154335,8 @@ self: {
        pname = "scotty";
        version = "0.11.0";
        sha256 = "892203c937ccf1279f5005ddb78ebea84629b80687a1e38fc118b38011a386ed";
-       revision = "3";
-       editedCabalFile = "03a2f153eb5cf597435251169e49c42066b4ee058fd20d31e2cecec52e6578bc";
+       revision = "4";
+       editedCabalFile = "0d6fc88c2396a69e0d0f23ccad17b7b47d548f67bc23e417aad2940fdd71c5a1";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class fail http-types monad-control mtl nats network
@@ -153957,18 +155333,19 @@ self: {
      }) {};
 
   "semdoc" = callPackage
-    ({ mkDerivation, base, containers, data-default-class, ghc
-     , ghc-paths, Glob, groom, mtl, pandoc, pandoc-types, regex-tdfa
+    ({ mkDerivation, base, containers, data-default-class
+     , data-default-instances-base, ghc, ghc-paths, Glob, groom, mtl
+     , pandoc, pandoc-types, regex-tdfa
      }:
      mkDerivation {
        pname = "semdoc";
-       version = "0.1.2";
-       sha256 = "b9a2c73fa5bd0346ae9b21e5ee158460689bf521f97996418b0d426c334b3dc8";
+       version = "0.1.3";
+       sha256 = "2bf204ebae0f1592ed192cd2ca288052d536e9da14102ebbafd74105f3515c58";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-default-class ghc ghc-paths Glob groom mtl
-         pandoc pandoc-types regex-tdfa
+         base containers data-default-class data-default-instances-base ghc
+         ghc-paths Glob groom mtl pandoc pandoc-types regex-tdfa
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://toktok.github.io/semdoc";
@@ -155335,18 +156712,18 @@ self: {
   "servant-github-webhook" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto
      , github, http-types, servant, servant-server, string-conversions
-     , text, wai, warp
+     , text, transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-github-webhook";
-       version = "0.3.0.0";
-       sha256 = "41c78c7c553e3c75fcca81e66bc4db8b5f7b3e2578d18b54715ecdc106b6c610";
+       version = "0.3.0.2";
+       sha256 = "06dceb189088b80e2b428572c6a7334dbf1557f7c208190ccd944273626079b9";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring Crypto github http-types
-         servant servant-server string-conversions text wai
+         servant servant-server string-conversions text transformers wai
        ];
        testHaskellDepends = [
-         aeson base bytestring servant-server wai warp
+         aeson base bytestring servant-server transformers wai warp
        ];
        homepage = "https://github.com/tsani/servant-github-webhook";
        description = "Servant combinators to facilitate writing GitHub webhooks";
@@ -155947,8 +157324,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204";
-       revision = "11";
-       editedCabalFile = "80507ee35eb6736752a80613e2a27fc89a50bbcdfc75c51785aeaf469af42902";
+       revision = "12";
+       editedCabalFile = "a8bcb29afce01078d5f6b71503ad0d7d03356a9ebeffb4ec09719a324c314519";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -156840,8 +158217,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.4";
-       sha256 = "b2769d6b01eab98de11c3c072a2cbc2a5706e0dfdcaf916b67fc344d49f1e09f";
+       version = "0.0.7";
+       sha256 = "f7859e7adbccb740c176fc186ca332f576be65265b87641d5ac30d2d34adfbdb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -158040,16 +159417,16 @@ self: {
      }) {};
 
   "simple-effects" = callPackage
-    ({ mkDerivation, base, ghc-prim, interlude-l, lens, list-t
+    ({ mkDerivation, array, base, interlude-l, lens, list-t
      , monad-control, mtl, transformers, transformers-base
      }:
      mkDerivation {
        pname = "simple-effects";
-       version = "0.6.0.1";
-       sha256 = "df8de9fae3ee9c2226565af8f8c4171d1b79678de37e3b280cda3ca013b52944";
+       version = "0.6.0.2";
+       sha256 = "f8f887e433a4f68a506966b2d41f614cb39602f8bb3b802535f91c2391711a36";
        libraryHaskellDepends = [
-         base ghc-prim interlude-l lens list-t monad-control mtl
-         transformers transformers-base
+         array base interlude-l lens list-t monad-control mtl transformers
+         transformers-base
        ];
        testHaskellDepends = [ base interlude-l ];
        homepage = "https://gitlab.com/LukaHorvat/simple-effects";
@@ -158941,8 +160318,8 @@ self: {
      }:
      mkDerivation {
        pname = "sized";
-       version = "0.2.0.0";
-       sha256 = "31f9233885bbe758a4c2f890e65695e11c64abdc12b6d4931427570cd7d4587c";
+       version = "0.2.1.0";
+       sha256 = "e5e936dab874a7766a8b3b50f15fc742cc57b956aef738ba98ef221b25d3731a";
        libraryHaskellDepends = [
          base constraints containers deepseq equational-reasoning hashable
          lens ListLike mono-traversable monomorphic singletons type-natural
@@ -159428,6 +160805,8 @@ self: {
        pname = "slug";
        version = "0.1.5";
        sha256 = "6bc271612759fd9a415ee382b620b0f5b1154c762eb3469a409dafd5f35282fc";
+       revision = "1";
+       editedCabalFile = "1cbade6e74ca1f38368323dc0e124d4b8f0abc661a53e8738f3700cbf553b218";
        libraryHaskellDepends = [
          aeson base exceptions path-pieces persistent text
        ];
@@ -159440,6 +160819,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "slug_0_1_6" = callPackage
+    ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data
+     , path-pieces, persistent, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "slug";
+       version = "0.1.6";
+       sha256 = "c4d589b30d7d4788ed5dbf1a24652a5f880751a0250707bf8ac82a3714734692";
+       libraryHaskellDepends = [
+         aeson base exceptions http-api-data path-pieces persistent
+         QuickCheck text
+       ];
+       testHaskellDepends = [
+         base exceptions hspec http-api-data path-pieces QuickCheck text
+       ];
+       homepage = "https://github.com/mrkkrp/slug";
+       description = "Type-safe slugs for Yesod ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallarray" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hashable }:
      mkDerivation {
@@ -159695,6 +161095,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smoothie_0_4_2_4" = callPackage
+    ({ mkDerivation, aeson, base, linear, text, vector }:
+     mkDerivation {
+       pname = "smoothie";
+       version = "0.4.2.4";
+       sha256 = "962e8c5927e24ebc56fa419bca2fc43db2a187c26410acd316d9914f8391d96c";
+       libraryHaskellDepends = [ aeson base linear text vector ];
+       homepage = "https://github.com/phaazon/smoothie";
+       description = "Smooth curves via several interpolation modes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smsaero" = callPackage
     ({ mkDerivation, aeson, base, containers, http-api-data
      , http-client, servant, servant-client, servant-docs, text, time
@@ -159756,23 +161169,59 @@ self: {
      }) {};
 
   "smtlib2" = callPackage
-    ({ mkDerivation, array, atto-lisp, attoparsec, base, blaze-builder
-     , bytestring, constraints, containers, data-fix, mtl, process
-     , tagged, text, transformers
+    ({ mkDerivation, base, constraints, containers, dependent-map
+     , dependent-sum, mtl, template-haskell
      }:
      mkDerivation {
        pname = "smtlib2";
-       version = "0.3.1";
-       sha256 = "3a46057e9b901fc0c5ced29dee8a00c69d3d0f9ec663edae9b9809616402c048";
+       version = "1.0";
+       sha256 = "3ca10e4ecc493a9b824301887fe2ff8de4594126bd04fa6fb5490110b615edf1";
        libraryHaskellDepends = [
-         array atto-lisp attoparsec base blaze-builder bytestring
-         constraints containers data-fix mtl process tagged text
-         transformers
+         base constraints containers dependent-map dependent-sum mtl
+         template-haskell
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "smtlib2-debug" = callPackage
+    ({ mkDerivation, ansi-terminal, atto-lisp, base, containers
+     , dependent-map, dependent-sum, mtl, smtlib2, smtlib2-pipe, text
+     }:
+     mkDerivation {
+       pname = "smtlib2-debug";
+       version = "1.0";
+       sha256 = "110e136813fbb257f2858e56ef58854fce04fcd2b972e701863e293aca87d761";
+       libraryHaskellDepends = [
+         ansi-terminal atto-lisp base containers dependent-map dependent-sum
+         mtl smtlib2 smtlib2-pipe text
+       ];
+       description = "Dump the communication with an SMT solver for debugging purposes";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "smtlib2-pipe" = callPackage
+    ({ mkDerivation, atto-lisp, attoparsec, base, blaze-builder
+     , bytestring, Cabal, cabal-test-quickcheck, containers
+     , dependent-sum, mtl, process, smtlib2, smtlib2-quickcheck, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "smtlib2-pipe";
+       version = "1.0";
+       sha256 = "6623f4a565cb09c797022716041dc8647d21b06a42f0fd05b988254551723c6d";
+       libraryHaskellDepends = [
+         atto-lisp attoparsec base blaze-builder bytestring containers
+         dependent-sum mtl process smtlib2 text transformers
+       ];
+       testHaskellDepends = [
+         base Cabal cabal-test-quickcheck smtlib2 smtlib2-quickcheck
+       ];
+       description = "A type-safe interface to communicate with an SMT solver";
+       license = stdenv.lib.licenses.gpl3;
+       broken = true;
+     }) {smtlib2-quickcheck = null;};
+
   "smtp-mail" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , bytestring, cryptohash, filepath, mime-mail, network, text
@@ -159887,8 +161336,8 @@ self: {
        pname = "snap";
        version = "1.0.0.1";
        sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8";
-       revision = "1";
-       editedCabalFile = "81129d186348ab67fda4278bb6c8575ee7a7caed3e6069e0045f464a4ed911ab";
+       revision = "2";
+       editedCabalFile = "162e742faa2af87763daf5c733ae2a0ff35c9b29d68de9659c948a24b1681e62";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist filepath hashable heist
@@ -160455,10 +161904,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-fay";
-       version = "0.3.3.13";
-       sha256 = "39810748b7177b45a0fab785e48ac497d81587e48dde9dc8ad75e8d704bdda3f";
-       revision = "5";
-       editedCabalFile = "0331163a9d3af919f0b01408f7a2d3542452e030cf838ec92f9bb6bf6c0f4ccd";
+       version = "0.3.3.14";
+       sha256 = "97a9a3ec90e03be064df0a6e3dcf5834de063fb43a24d1014eb3d0ba8bac4207";
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -161506,10 +162953,10 @@ self: {
     ({ mkDerivation, base, network, transformers, unix }:
      mkDerivation {
        pname = "socket-activation";
-       version = "0.1.0.1";
-       sha256 = "aafe00774b8403edacb04b8d4dc6f38028f5173f57a5c4de43e9d26f02eb3f81";
+       version = "0.1.0.2";
+       sha256 = "b99e7b4f296cd462aac84e5bb61fb02953e2080d1351e9e10a63d35dc34eb43b";
        libraryHaskellDepends = [ base network transformers unix ];
-       homepage = "https://github.com/sakana/haskell-socket-activation";
+       homepage = "https://github.com/ddfisher/haskell-socket-activation";
        description = "systemd socket activation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161546,6 +162993,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) lksctp-tools;};
 
+  "socket-unix" = callPackage
+    ({ mkDerivation, async, base, bytestring, socket, tasty
+     , tasty-hunit, unix
+     }:
+     mkDerivation {
+       pname = "socket-unix";
+       version = "0.1.0.0";
+       sha256 = "34c71e014e728a4c5f31fbb55ac0d46f049969a8860e2b8629369f4d83429f2d";
+       revision = "1";
+       editedCabalFile = "082468d0b01112a99fffa76d7ff1bbe1b0ebbf878b3364fecec64a73fed094a3";
+       libraryHaskellDepends = [ base bytestring socket ];
+       testHaskellDepends = [
+         async base bytestring socket tasty tasty-hunit unix
+       ];
+       homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme";
+       description = "Unix domain sockets";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "socketio" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , blaze-builder, bytestring, conduit, conduit-extra, http-types
@@ -163516,6 +164982,8 @@ self: {
        pname = "stache";
        version = "0.1.8";
        sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2";
+       revision = "1";
+       editedCabalFile = "642777f5664ae40b2e5308ca771a505226b0015414203658432e002c846e5ad7";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -163540,6 +165008,8 @@ self: {
        pname = "stache";
        version = "0.2.0";
        sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831";
+       revision = "1";
+       editedCabalFile = "5b22600a5b101c5c86d688d05773c7506e9cc373637ef7a2a1abe43a28db0703";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory exceptions
          filepath megaparsec mtl template-haskell text unordered-containers
@@ -164536,19 +166006,19 @@ self: {
   "staversion" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, hspec, http-client, http-client-tls, http-types
-     , optparse-applicative, QuickCheck, text, transformers
+     , megaparsec, optparse-applicative, QuickCheck, text, transformers
      , transformers-compat, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.1.2.0";
-       sha256 = "43db7f70ca360b0d858572afaf012ba10cda7f0ea19511c4e036bdfbb832e917";
+       version = "0.1.3.2";
+       sha256 = "d3281fe9b7aa3795251c7e45d6364bfb051ffa3bee44d691f40c0c928fe886e0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath http-client
-         http-client-tls http-types optparse-applicative text transformers
-         transformers-compat unordered-containers yaml
+         http-client-tls http-types megaparsec optparse-applicative text
+         transformers transformers-compat unordered-containers yaml
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -165783,6 +167253,7 @@ self: {
        homepage = "http://github.com/jb55/streaming-wai";
        description = "Streaming Wai utilities";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "streamproc" = callPackage
@@ -166047,14 +167518,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "string-conversions_0_4_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck
+     , quickcheck-instances, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "string-conversions";
+       version = "0.4.0.1";
+       sha256 = "46bcce6d9ce62c558b7658a75d9c6a62f7259d6b0473d011d8078234ad6a1994";
+       libraryHaskellDepends = [ base bytestring text utf8-string ];
+       testHaskellDepends = [
+         base bytestring deepseq hspec QuickCheck quickcheck-instances text
+         utf8-string
+       ];
+       homepage = "https://github.com/soenkehahn/string-conversions#readme";
+       description = "Simplifies dealing with different types for strings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "string-convert" = callPackage
     ({ mkDerivation, base, bytestring, tasty, tasty-hunit, text
      , utf8-string
      }:
      mkDerivation {
        pname = "string-convert";
-       version = "3.0.1";
-       sha256 = "2483d444a88f6557976bd69975bf6d363da734934f2582f6780edee348fc8a2c";
+       version = "4.0.0.1";
+       sha256 = "9675b98f7e798fbfe89c18cb6ac8f44237c6a92c0f0b2344a26fad4c3e53d1c8";
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit text utf8-string
@@ -166351,6 +167841,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "strive_3_0_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
+     , http-client, http-client-tls, http-types, markdown-unlit
+     , template-haskell, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "strive";
+       version = "3.0.2";
+       sha256 = "94f1dcef7ded8a27365d448e2db70baa5fafc91fa047dbb35164f82fd84f0b0f";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default gpolyline http-client
+         http-client-tls http-types template-haskell text time transformers
+       ];
+       testHaskellDepends = [ base bytestring markdown-unlit time ];
+       homepage = "https://github.com/tfausak/strive#readme";
+       description = "A client for the Strava V3 API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strptime" = callPackage
     ({ mkDerivation, base, bytestring, text, time }:
      mkDerivation {
@@ -166619,8 +168129,8 @@ self: {
      }:
      mkDerivation {
        pname = "styx";
-       version = "1.0";
-       sha256 = "2fc5e840d35663ca10771758dec362017f32611675e44fe2e988dd12a05e293c";
+       version = "1.1";
+       sha256 = "b11402bde5b548b3f5cd2e1f501940e94c85628709aa0609e334bdf53e065144";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -171698,6 +173208,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-lens" = callPackage
+    ({ mkDerivation, base, extra, hspec, lens, text }:
+     mkDerivation {
+       pname = "text-lens";
+       version = "0.1.0.0";
+       sha256 = "e013ed9ba9385395e1eddc01c0da049f865ff020403e4af9671782b1b307cd2d";
+       libraryHaskellDepends = [ base extra lens text ];
+       testHaskellDepends = [ base hspec lens ];
+       homepage = "https://github.com/ChrisPenner/rasa";
+       description = "Lenses for operating over text";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "text-lips" = callPackage
     ({ mkDerivation, base, containers, parsers, text, text-loc
      , transformers
@@ -171844,6 +173367,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-postgresql_0_0_2_2" = callPackage
+    ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "text-postgresql";
+       version = "0.0.2.2";
+       sha256 = "91344e495a83ee7ca372977166523a28bf201a964cac1cc2d8260a448462200d";
+       libraryHaskellDepends = [
+         base dlist transformers transformers-compat
+       ];
+       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Parser and Printer of PostgreSQL extended types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-printer" = callPackage
     ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups
      , test-framework, test-framework-quickcheck2, text, text-latin1
@@ -172846,6 +174387,8 @@ self: {
        pname = "these";
        version = "0.7.3";
        sha256 = "14339c111ec2caffcb2a9f64164a5dc307a0afb716925ddcb1774d9d442a3d9b";
+       revision = "1";
+       editedCabalFile = "d351c189525daded1e727f4a705f568d019238c9a4dd60e0277be462f49bede2";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -173567,28 +175110,24 @@ self: {
      }) {};
 
   "time-exts" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bindings-DSL, containers
-     , convertible, data-default, deepseq, fclabels, mtl, old-locale
-     , QuickCheck, random, text, time, timezone-olson
+    ({ mkDerivation, attoparsec, base, bindings-DSL, deepseq, HUnit
+     , ieee754, lens-simple, mtl, old-locale, QuickCheck, random, text
+     , time, tz
      }:
      mkDerivation {
        pname = "time-exts";
-       version = "2.1.0";
-       sha256 = "7519345408bd1f856af169e3185d69f7a3a0be045b91084a40909a4a7357e378";
-       isLibrary = true;
-       isExecutable = true;
+       version = "3.0.3";
+       sha256 = "1aca7fd7f52fc8dcd29c4b7cfbd4f24360a84b77e91e68b9d72318f98725786c";
        libraryHaskellDepends = [
-         aeson attoparsec base bindings-DSL containers convertible
-         data-default deepseq fclabels mtl old-locale QuickCheck random text
-         time timezone-olson
+         attoparsec base bindings-DSL deepseq lens-simple mtl old-locale
+         random text time tz
        ];
-       executableHaskellDepends = [
-         aeson attoparsec base bindings-DSL containers convertible
-         data-default deepseq fclabels mtl old-locale QuickCheck random text
-         time timezone-olson
+       testHaskellDepends = [
+         attoparsec base bindings-DSL deepseq HUnit ieee754 lens-simple mtl
+         old-locale QuickCheck random text time tz
        ];
        homepage = "https://github.com/enzoh/time-exts";
-       description = "Efficient Timestamps";
+       description = "Yet another time library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -173705,8 +175244,8 @@ self: {
     ({ mkDerivation, base, intervals, lens, thyme, vector-space }:
      mkDerivation {
        pname = "time-patterns";
-       version = "0.1.3.1";
-       sha256 = "56a0ac5f1a6a264f779d3de15ac09a204eda5a2fb04122e398fa9bb6848dee9d";
+       version = "0.1.3.2";
+       sha256 = "3c2beb5b4f69213699cdc9e2f88872d1d406eb04c93ad3678e09b6746aa40a61";
        libraryHaskellDepends = [ base intervals lens thyme vector-space ];
        homepage = "https://bitbucket.org/jfmueller/time-patterns";
        description = "Patterns for recurring events";
@@ -173819,8 +175358,8 @@ self: {
      }:
      mkDerivation {
        pname = "time-warp";
-       version = "1.1.1.0";
-       sha256 = "4e9fa28d8c67801fc302a7eec2457a2dda41b556129aebf0821bc250307ded4d";
+       version = "1.1.1.1";
+       sha256 = "df2721daeee24eac57f2ba1f1eff4b0f87260340537cd5e3cbe8d6c27b1094fd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174059,8 +175598,8 @@ self: {
      }:
      mkDerivation {
        pname = "timeplot";
-       version = "1.0.31";
-       sha256 = "8dc8e4901b4b2f84c654d34f6721762bb662697b89dcfad969180a00820254b2";
+       version = "1.0.32";
+       sha256 = "3b560a5cf4d81daf5e4cf58d566893baf7daa9244b51c60cce71ac23bc6a5c46";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -174820,6 +176359,8 @@ self: {
        pname = "toml";
        version = "0.1.3";
        sha256 = "c29946c58656443d0dbf18aad0582707311c691ab624a63c8f9614a4950c7e71";
+       revision = "1";
+       editedCabalFile = "4eac5e516c0e461ceef73150d7a248bce199fc02183074a622c0dab17513ca20";
        libraryHaskellDepends = [
          attoparsec base bytestring containers old-locale time
        ];
@@ -176183,7 +177724,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tttool_1_6_1_3" = callPackage
+  "tttool_1_6_1_4" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline, HPDF
      , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
@@ -176192,8 +177733,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.6.1.3";
-       sha256 = "7ca01c73dad41aab3b002db4c6f4e929be01c982c397dbca0e65315171339d45";
+       version = "1.6.1.4";
+       sha256 = "66f14d6abe28e2d2a1a61cbef0fe8ace0c376b2e2a8b918b17d422634faee8ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -176709,6 +178250,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "twfy-api-client" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
+     , either, exceptions, http-client, http-client-tls, http-media, mtl
+     , servant, servant-client, servant-server, text, transformers
+     }:
+     mkDerivation {
+       pname = "twfy-api-client";
+       version = "0.1.0.0";
+       sha256 = "c11fa34e03dbfba6fc208c6816c8f461daf78eeb835e67cd8a91a327d426e265";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring either exceptions
+         http-client http-client-tls http-media mtl servant servant-client
+         servant-server text transformers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-compat base base-compat either http-client
+         http-client-tls mtl servant servant-client text transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/wiggly/twfy-api-client#readme";
+       description = "They Work For You API Client Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "twhs" = callPackage
     ({ mkDerivation, ansi-terminal, authenticate-oauth, base
      , bytestring, case-insensitive, conduit, containers, data-default
@@ -176978,6 +178545,8 @@ self: {
        pname = "twitter-feed";
        version = "0.2.0.11";
        sha256 = "8b98b4ddfb88f4c14f8eb43bd74a4c4e7941a92d44b90717e9b8dbe4c454c889";
+       revision = "1";
+       editedCabalFile = "3d0a5d8976c482b401003571812052a97cd0d77fb3d6f0619615c30c93a0b79e";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -177464,8 +179033,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-natural";
-       version = "0.7.1.1";
-       sha256 = "16867acdf4bfe3637a9c0730eca4156d3c830abca60182d8a561c4fabe6f7231";
+       version = "0.7.1.2";
+       sha256 = "c278c2660616179e61641d1d5356549946560ef2de66416b20d868f5fe1082e6";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger monomorphic singletons template-haskell
@@ -179729,8 +181298,8 @@ self: {
      }:
      mkDerivation {
        pname = "up";
-       version = "1.0.0.3";
-       sha256 = "7e93219da62895cbea56ed91cefe3d0511bf57120b5ad6166f798b5e6d9567f0";
+       version = "1.0.0.4";
+       sha256 = "3412742f52d9ba598341fa74f89bc6e78acac81fe8409069af15912015fe340f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -180610,6 +182179,8 @@ self: {
        pname = "uuid-aeson";
        version = "0.1.0.0";
        sha256 = "cf8bdb82959d249ced20dff22935bd2ea79b1869267a95ebcacc7f0452eda259";
+       revision = "1";
+       editedCabalFile = "5fe65c563ef474292cf59cda8e36416dd75a60a05fc1fb8be43a0bd2eba1d814";
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
@@ -181703,12 +183274,12 @@ self: {
      }) {};
 
   "vector-sized" = callPackage
-    ({ mkDerivation, base, deepseq, vector }:
+    ({ mkDerivation, base, deepseq, finite-typelits, vector }:
      mkDerivation {
        pname = "vector-sized";
-       version = "0.4.1.0";
-       sha256 = "19205fe36c63edfc52ea0f057bdf13ac22c71f5e40afc666bc9c6ff20846ca39";
-       libraryHaskellDepends = [ base deepseq vector ];
+       version = "0.5.0.0";
+       sha256 = "55bb88f7201571b19b55f7ac1d1b2a880ad77b9178593bac84cad58c2dbce22b";
+       libraryHaskellDepends = [ base deepseq finite-typelits vector ];
        homepage = "http://github.com/expipiplus1/vector-sized#readme";
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -181841,6 +183412,28 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "vectortiles_1_2_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, deepseq, hex
+     , protobuf, tasty, tasty-hunit, text, th-printf, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "vectortiles";
+       version = "1.2.0.1";
+       sha256 = "fb034cb99c10f61ff0d2d7454b51d0e5996c5443a652e436490313d7a064401d";
+       libraryHaskellDepends = [
+         base bytestring cereal containers deepseq protobuf text th-printf
+         transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring cereal hex protobuf tasty tasty-hunit text vector
+       ];
+       homepage = "https://github.com/fosskers/vectortiles";
+       description = "GIS Vector Tiles, as defined by Mapbox";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "verbalexpressions" = callPackage
     ({ mkDerivation, base, regex-pcre }:
      mkDerivation {
@@ -183671,6 +185264,8 @@ self: {
        pname = "wai-middleware-static";
        version = "0.8.1";
        sha256 = "e0b5f13f410f81897759acf43198a08101d2af4c9d506164367c7d1a96d55375";
+       revision = "1";
+       editedCabalFile = "2884eb9d594bdc91a8ab7dd045e4252472c45361907c470f594a7f2a573d7752";
        libraryHaskellDepends = [
          base bytestring containers cryptonite directory expiring-cache-map
          filepath http-types memory mime-types mtl old-locale semigroups
@@ -183780,6 +185375,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-request-spec_0_10_2_4" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-types, text, wai
+     }:
+     mkDerivation {
+       pname = "wai-request-spec";
+       version = "0.10.2.4";
+       sha256 = "1ee1ed12ef41a7023e24629c46835ed9602643328e0cc3de0c9b934d31eed610";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-types text wai
+       ];
+       homepage = "https://gitlab.com/queertypes/wai-request-spec";
+       description = "Declarative request parsing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-responsible" = callPackage
     ({ mkDerivation, base, bytestring, http-types, wai }:
      mkDerivation {
@@ -184387,8 +185999,8 @@ self: {
      }:
      mkDerivation {
        pname = "wave";
-       version = "0.1.2";
-       sha256 = "930d16bc03779c42bdf117ba2a2ac30b3ab08f9d214d9ca52526150d9eec07e3";
+       version = "0.1.4";
+       sha256 = "686687782dca7c522190bca70171682b24af8c89e4f3aa63da455c331daeb6bc";
        libraryHaskellDepends = [
          base bytestring cereal containers data-default-class transformers
        ];
@@ -184793,16 +186405,16 @@ self: {
 
   "web3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, cryptonite, data-default-class, http-client, memory
-     , mtl, template-haskell, text, transformers, vector
+     , bytestring, cryptonite, http-client, http-client-tls, memory
+     , template-haskell, text, transformers, vector
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.4.1.0";
-       sha256 = "ead3b350b138946ec921c1e1c13ae6bf52f2ba89e7626ba79a562a5bef63faac";
+       version = "0.5.1.0";
+       sha256 = "57eb367f392f1c7ed230cb151b6a7ac8fda44e11075bbd39407e9c34125947ee";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring cryptonite
-         data-default-class http-client memory mtl template-haskell text
+         http-client http-client-tls memory template-haskell text
          transformers vector
        ];
        testHaskellDepends = [ base memory text ];
@@ -186141,20 +187753,21 @@ self: {
   "wolf" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , amazonka-swf, base, bytestring, conduit, conduit-combinators
-     , conduit-extra, directory, exceptions, filemanip, lifted-async
-     , monad-control, optparse-applicative, optparse-generic, preamble
-     , process, resourcet, shakers, text, time, uuid, yaml
+     , conduit-extra, directory, exceptions, filemanip, filepath
+     , lifted-async, monad-control, optparse-applicative
+     , optparse-generic, preamble, process, resourcet, shakers, text
+     , time, uuid, yaml
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.4";
-       sha256 = "8d22d044f67a1edf37cbb59cc3226585dcaa15f1c2b83696d7e191d50053aea2";
+       version = "0.3.6";
+       sha256 = "0be99a2ae98daaf9f2d499dd3f360a79e258c97874d81a3f32d97da17dce64fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-swf base
          bytestring conduit conduit-combinators conduit-extra directory
-         exceptions filemanip lifted-async monad-control
+         exceptions filemanip filepath lifted-async monad-control
          optparse-applicative preamble process resourcet text time uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
@@ -187336,7 +188949,7 @@ self: {
 
   "xfconf" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, glib
-     , gtk2hs-buildtools, libxfconf-0
+     , gtk2hs-buildtools, libxfconf
      }:
      mkDerivation {
        pname = "xfconf";
@@ -187346,13 +188959,13 @@ self: {
        editedCabalFile = "ce4bb3ab326d8e4c0a4fc2576045b589305b12f7ca28b79a69fcc367c429d33c";
        setupHaskellDepends = [ base Cabal containers directory filepath ];
        libraryHaskellDepends = [ base glib ];
-       libraryPkgconfigDepends = [ libxfconf-0 ];
+       libraryPkgconfigDepends = [ libxfconf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {libxfconf-0 = null;};
+     }) {libxfconf = null;};
 
   "xformat" = callPackage
     ({ mkDerivation, base }:
@@ -187651,7 +189264,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "xlsx_0_4_0" = callPackage
+  "xlsx_0_4_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
      , conduit, containers, data-default, Diff, errors, extra, filepath
      , groom, lens, mtl, mtl-compat, network-uri, old-locale
@@ -187661,8 +189274,8 @@ self: {
      }:
      mkDerivation {
        pname = "xlsx";
-       version = "0.4.0";
-       sha256 = "1cb379b7cbc0783831f352d034c307a414bb2f1de158b5aec2a4c7cbebaee16a";
+       version = "0.4.1";
+       sha256 = "014d7ecc815f452e86b199ef0715548d7221f1f0a5cfb59ec92ffa86918ef5c6";
        libraryHaskellDepends = [
          base base64-bytestring binary-search bytestring conduit containers
          data-default errors extra filepath lens mtl mtl-compat network-uri
@@ -189579,15 +191192,17 @@ self: {
      }) {};
 
   "yeshql" = callPackage
-    ({ mkDerivation, base, containers, filepath, HDBC, parsec, stm
-     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
+    ({ mkDerivation, base, containers, convertible, filepath, HDBC
+     , parsec, stm, syb-with-class, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell
      }:
      mkDerivation {
        pname = "yeshql";
-       version = "1.0.0.1";
-       sha256 = "c535ab7797d2ad062a351f688d147908d79770c1e0881e4340c9d8ab25307bfc";
+       version = "2.2.0.0";
+       sha256 = "3a17da3d051c19d44cd65bdccd3f47ca78c9df6b9190ca732dba16ad086c9e2d";
        libraryHaskellDepends = [
-         base containers filepath HDBC parsec template-haskell
+         base containers convertible filepath HDBC parsec syb-with-class
+         template-haskell
        ];
        testHaskellDepends = [
          base HDBC stm tasty tasty-hunit tasty-quickcheck
@@ -189623,6 +191238,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod_1_4_4" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , conduit, conduit-extra, data-default-class, directory
+     , fast-logger, monad-control, monad-logger, resourcet, semigroups
+     , shakespeare, streaming-commons, template-haskell, text
+     , transformers, unix, unordered-containers, wai, wai-extra
+     , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod";
+       version = "1.4.4";
+       sha256 = "5f2caade2435754ff35060c3ae58390ad87650b975e83a65f8013e80ea7bea2c";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring conduit conduit-extra
+         data-default-class directory fast-logger monad-control monad-logger
+         resourcet semigroups shakespeare streaming-commons template-haskell
+         text transformers unix unordered-containers wai wai-extra
+         wai-logger warp yaml yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-angular" = callPackage
     ({ mkDerivation, aeson, base, containers, shakespeare
      , template-haskell, text, transformers, yesod
@@ -189942,8 +191582,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-nopassword";
-       version = "0.1.0.1";
-       sha256 = "a2ae8ba484ebd509eb8507b879eae29876ee9284facf1dfc4f94eea4f092106f";
+       version = "0.1.1.1";
+       sha256 = "0e1daf32cb9e57b85e89412e089a49308d5364ad98f3def64494e195fd0cf7b2";
        libraryHaskellDepends = [
          base blaze-markup http-types pwstore-fast text uuid yesod-auth
          yesod-core yesod-form
@@ -190769,6 +192409,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-paypal-rest" = callPackage
+    ({ mkDerivation, base, paypal-rest-client, time, yesod-core }:
+     mkDerivation {
+       pname = "yesod-paypal-rest";
+       version = "0.1.0";
+       sha256 = "b09605850782f9d1f6688f29a8e40597168e74e26ce239e638c1e840e17dcdf7";
+       libraryHaskellDepends = [
+         base paypal-rest-client time yesod-core
+       ];
+       description = "Yesod plugin to use PayPal with the paypal-rest-client library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-persistent" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet

From f8a1e87e074c3d22a53fb7149dbab84a3b95ad41 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 3 Jan 2017 23:56:04 +0100
Subject: [PATCH 78/90] git-annex: update to latest version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2d39e68c9a1..ff53f1ce2ca 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -54,7 +54,7 @@ self: super: {
     src = pkgs.fetchFromGitHub {
       owner = "joeyh";
       repo = "git-annex";
-      sha256 = "1a87kllzxmjwkz5arq4c3bp7qfkabn0arbli6s6i68fkgm19s4gr";
+      sha256 = "1vy6bj7f8zyj4n1r0gpi0r7mxapsrjvhwmsi5sbnradfng5j3jya";
       rev = drv.version;
     };
   })).overrideScope (self: super: {

From 5ebee164fa9fa4f9ed0a52ba86faf845a6c3f172 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 6 Jan 2017 11:37:42 +0100
Subject: [PATCH 79/90] mpd: 0.9.19 -> 0.20

Add support for no-minor-version

@grahamc:
This includes 0.19.21 fix for some ffmpeg-related crash, do we expect
this to be a security issue worth updating in stable? Is it OK to just
put 0.20 there or do we want to have 0.9.21 bugfix release there?
---
 pkgs/servers/mpd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 4b26b92cdb2..5b2195b3d7e 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -29,14 +29,14 @@
 let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
-  major = "0.19";
-  minor = "19";
+  major = "0.20";
+  minor = "";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-${major}.${minor}";
+  name = "mpd-${major}${if minor == "" then "" else "." + minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
-    sha256 = "07af1m2lgblyiq0gcs26zv8n22wrhrpmf49xsm338h1n87d6r1dw";
+    sha256 = "068nxsfkp2ppcjh3fmcbapkiwnjpvkii73bfydpw4bf2yphdvsa8";
   };
 
   patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch;

From 98c9db00d8576f4ebe8e13ea857bd679118d4f06 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 6 Jan 2017 18:56:26 +0800
Subject: [PATCH 80/90] git-up: not a python package

1. git-up is a python package as such but an application, so move it out of python-packages.nix
2. get rid of the tests (we've already run the tests)
---
 .../version-management/git-up/default.nix     | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 pkgs/top-level/python-packages.nix            | 29 ---------------
 3 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/applications/version-management/git-up/default.nix

diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
new file mode 100644
index 00000000000..c93ee924466
--- /dev/null
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, python2Packages, git }:
+
+python2Packages.buildPythonApplication rec {
+  version = "1.4.2";
+  name = "git-up-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/g/git-up/${name}.zip";
+    sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
+  };
+
+  buildInputs = [ git ] ++ (with python2Packages; [ nose ]);
+  propagatedBuildInputs = with python2Packages; [ click colorama docopt GitPython six termcolor ];
+
+  # 1. git fails to run as it cannot detect the email address, so we set it
+  # 2. $HOME is by default not a valid dir, so we have to set that too
+  # https://github.com/NixOS/nixpkgs/issues/12591
+  preCheck = ''
+      export HOME=$TMPDIR
+      git config --global user.email "nobody@example.com"
+      git config --global user.name "Nobody"
+    '';
+
+  postInstall = ''
+    rm -r $out/${python2Packages.python.sitePackages}/PyGitUp/tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/msiemens/PyGitUp;
+    description = "A git pull replacement that rebases all local branches when pulling.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63cce742d7b..fa69f9c8aae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1863,6 +1863,8 @@ in
 
   git-lfs = callPackage ../applications/version-management/git-lfs { };
 
+  git-up = callPackage ../applications/version-management/git-up { };
+
   gitfs = callPackage ../tools/filesystems/gitfs { };
 
   gitinspector = callPackage ../applications/version-management/gitinspector { };
@@ -14516,7 +14518,7 @@ in
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
     qt = qt4;
   };
-  
+
   qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06fe9cbf1b2..3f3b30bca2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7334,35 +7334,6 @@ in {
 
   };
 
-  git-up = buildPythonPackage rec {
-    version = "1.4.2";
-    name = "git-up-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/git-up/${name}.zip";
-      sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
-    };
-
-    buildInputs = with self; [ pkgs.git nose ];
-    propagatedBuildInputs = with self; [ click colorama docopt GitPython six termcolor ];
-
-    # git fails to run as it cannot detect the email address, so we set it
-    # $HOME is by default not a valid dir, so we have to set that too
-    # https://github.com/NixOS/nixpkgs/issues/12591
-    preCheck = ''
-      export HOME=$TMPDIR
-      git config --global user.email "nobody@example.com"
-      git config --global user.name "Nobody"
-    '';
-
-    meta = {
-      homepage = http://github.com/msiemens/PyGitUp;
-      description = "A git pull replacement that rebases all local branches when pulling.";
-      license = licenses.mit;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
-  };
-
   GitPython = buildPythonPackage rec {
     version = "2.0.8";
     name = "GitPython-${version}";

From 74a97421ceaaa609ba94835d7d9a7f25bc592fe6 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 6 Jan 2017 11:57:40 +0100
Subject: [PATCH 81/90] lean: 2016-12-30 -> 2017-01-06

---
 pkgs/applications/science/logic/lean/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index af338338550..ece867de2a0 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "2016-12-30";
+  version = "2017-01-06";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
-    rev    = "fd4fffea27c442b12a45f664a8680ebb47482ca3";
-    sha256 = "1izbjxbr1nvv5kv2b7qklqjx2b1qmwrxhmvk0f2lrl9pxz9h0bmd";
+    rev    = "6f8ccb5873b6f72d735e700e25044e99c6ebb7b6";
+    sha256 = "1nxbqdc6faxivbrifb7b9j5zl5kml9w5pa63afh93z2ng7mn0jyg";
   };
 
   buildInputs = [ gmp mpfr cmake gperftools ];

From 4799971895a7594b8bef5db00c30f0b7e69498ff Mon Sep 17 00:00:00 2001
From: Richard Zetterberg <richard.zetterberg@googlemail.com>
Date: Thu, 5 Jan 2017 20:44:25 +0100
Subject: [PATCH 82/90] godot: init at 2.1.1-stable

Adds the [godot engine](https://godotengine.org/) at the latest stable
version.

Produced binary contains the tools and the engine itself.
---
 pkgs/development/tools/godot/default.nix      | 40 +++++++++++++++++++
 .../tools/godot/pkg_config_additions.patch    | 12 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/tools/godot/default.nix
 create mode 100644 pkgs/development/tools/godot/pkg_config_additions.patch

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
new file mode 100644
index 00000000000..7ebbc1b88e3
--- /dev/null
+++ b/pkgs/development/tools/godot/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, gcc, scons, pkgconfig, libX11, libXcursor
+, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib
+, libpulseaudio, mesa, mesa_glu, zlib }:
+
+stdenv.mkDerivation rec {
+  name    = "godot-${version}";
+  version = "2.1.1-stable";
+
+  src = fetchFromGitHub {
+    owner  = "godotengine";
+    repo   = "godot";
+    rev    = version;
+    sha256 = "071qkm1l6yn2s9ha67y15w2phvy5m5wl3wqvrslhfmnsir3q3k01";
+  };
+
+  buildInputs = [
+    gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender
+    freetype openssl alsaLib libpulseaudio mesa mesa_glu zlib
+  ];
+
+  patches = [ ./pkg_config_additions.patch ];
+
+  enableParallelBuilding = true;
+
+  buildPhase = ''
+    scons platform=x11 prefix=$out -j $NIX_BUILD_CORES
+  '';
+
+  installPhase = ''
+    mkdir $out/bin -p
+    cp bin/godot.* $out/bin/
+  '';
+
+  meta = {
+    homepage    = "http://godotengine.org";
+    description = "Free and Open Source 2D and 3D game engine";
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
new file mode 100644
index 00000000000..f5e835a7374
--- /dev/null
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -0,0 +1,12 @@
++++ build/platform/x11/detect.py
+@@ -132,6 +132,10 @@
+     env.ParseConfig('pkg-config xinerama --cflags --libs')
+     env.ParseConfig('pkg-config xcursor --cflags --libs')
+     env.ParseConfig('pkg-config xrandr --cflags --libs')
++    env.ParseConfig('pkg-config xrender --cflags --libs')
++    env.ParseConfig('pkg-config osmesa --cflags')
++    env.ParseConfig('pkg-config glu --cflags --libs')
++    env.ParseConfig('pkg-config zlib --cflags --libs')
+
+     if (env['builtin_openssl'] == 'no'):
+         env.ParseConfig('pkg-config openssl --cflags --libs')
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e175e50d1f..76d36242ed0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1938,6 +1938,8 @@ in
 
   gocryptfs = callPackage ../tools/filesystems/gocrypfs { };
 
+  godot = callPackage ../development/tools/godot {};
+
   go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
 
   go-pup = callPackage ../development/tools/pup { };

From 9fc4536ac886c082790c48c47b3d90b250a879e4 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 12:46:05 +0100
Subject: [PATCH 83/90] mutagen: 1.34 -> 1.36

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 875837d1032..a278b2ecbfb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15016,16 +15016,16 @@ in {
   };
 
   mutagen = buildPythonPackage (rec {
-    name = "mutagen-1.34";
+    name = "mutagen-1.36";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/m/mutagen/${name}.tar.gz";
-      sha256 = "06anfzpjajwwh25n3afavwafrix3abahgwfr2zinrhqh2w98kw5s";
+      sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp";
     };
 
     # Needed for tests only
-    buildInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
-      pkgs.glibcLocales
+    buildInputs = with self; [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
+      pkgs.glibcLocales pytest
     ];
     LC_ALL = "en_US.UTF-8";
 

From 0b3e1e0486bd85fe8163cbc62d64fef3cc8a94c2 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 12:46:38 +0100
Subject: [PATCH 84/90] picard: remove unused buildInputs

---
 pkgs/applications/audio/picard/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 4b789e158bb..bbd59f56f70 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, python2Packages, fetchurl, gettext
-, pkgconfig, libofa, ffmpeg, chromaprint
-}:
+{ stdenv, python2Packages, fetchurl, gettext, chromaprint }:
 
 let
   version = "1.3.2";
@@ -14,12 +12,7 @@ in pythonPackages.buildPythonApplication {
     sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77";
   };
 
-  buildInputs = [
-    pkgconfig
-    ffmpeg
-    libofa
-    gettext
-  ];
+  buildInputs = [ gettext ];
 
   propagatedBuildInputs = with pythonPackages; [
     pyqt4

From 3c2cbd3259926a595a82fe502417b85e931002a1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 6 Jan 2017 08:39:12 -0500
Subject: [PATCH 85/90] ghc-head: bump

---
 pkgs/development/compilers/ghc/head.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 0581038d18d..081f554e06b 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -7,7 +7,7 @@ let
 
   commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
-  version = "8.1.20161224";
+  version = "8.1.20170106";
 
   commonPreConfigure =  ''
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
@@ -19,12 +19,12 @@ let
 in stdenv.mkDerivation (rec {
   inherit version;
   name = "ghc-${version}";
-  rev = "2689a1692636521777f007861a484e7064b2d696";
+  rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "0rk6xy7kgxx849nprq1ji459p88nyy93236g841m5p6mdh7mmrcr";
+    sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0";
   };
 
   postPatch = "patchShebangs .";
@@ -86,9 +86,6 @@ in stdenv.mkDerivation (rec {
 } // stdenv.lib.optionalAttrs (cross != null) {
   name = "${cross.config}-ghc-${version}";
 
-  # Some fixes for cross-compilation to iOS. See https://phabricator.haskell.org/D2710 (D2711,D2712,D2713)
-  patches = [ ./D2710.patch ./D2711.patch ./D2712.patch ./D2713.patch ];
-
   preConfigure = commonPreConfigure + ''
     sed 's|#BuildFlavour  = quick-cross|BuildFlavour  = perf-cross|' mk/build.mk.sample > mk/build.mk
   '';

From 321d5a01b62bfdd2ba68c7dc662ef02796a16d0b Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Fri, 6 Jan 2017 16:31:30 +0100
Subject: [PATCH 86/90] r-modules: fix seewave package

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 2ef3fbdd076..093bc2f7884 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -340,7 +340,7 @@ let
     rzmq = [ pkgs.zeromq3 ];
     SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
     sdcTable = [ pkgs.gmp pkgs.glpk ];
-    seewave = [ pkgs.fftw pkgs.libsndfile ];
+    seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
     seqinr = [ pkgs.zlib ];
     seqminer = [ pkgs.zlib pkgs.bzip2 ];
     showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];

From 7ee897a3b3aa75dc53bd408ceea5f9e4e98822b2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 6 Jan 2017 10:37:04 -0500
Subject: [PATCH 87/90] libuv: Tests fail when cross-compiling

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

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index f9e7cf389bb..fd422a514ef 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  crossAttrs.doCheck = false;
+
   meta = with lib; {
     description = "A multi-platform support library with a focus on asynchronous I/O";
     homepage    = https://github.com/libuv/libuv;

From 3799f9322ae1d6a26748bdbf6932b0b4a5dba05b Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@aubble.com>
Date: Fri, 6 Jan 2017 08:48:58 -0500
Subject: [PATCH 88/90] neovim: removed unncessary man configuration

Latest neovim uses a rewritten man plugin that does not need
these changes.
---
 pkgs/applications/editors/neovim/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index a9a9b6952bd..cbaf14cee60 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
-, libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig
+, libtool, libuv, luajit, luaPackages, ncurses, perl, pkgconfig
 , unibilium, makeWrapper, vimUtils, xsel, gperf
 
 , withPython ? true, pythonPackages, extraPythonPackages ? []
@@ -118,10 +118,7 @@ let
     # triggers on buffer overflow bug while running tests
     hardeningDisable = [ "fortify" ];
 
-    preConfigure = ''
-      substituteInPlace runtime/autoload/man.vim \
-        --replace /usr/bin/man ${man}/bin/man
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
       export DYLD_LIBRARY_PATH=${jemalloc}/lib
       substituteInPlace src/nvim/CMakeLists.txt --replace "    util" ""
     '';

From f3381f0be2949a44613ae8d0a17ff307200e2426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 6 Jan 2017 19:00:17 +0100
Subject: [PATCH 89/90] electron: 1.2.2 -> 1.4.13

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

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index e789370d585..1bd7ac76bb1 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
 
 let
-  version = "1.2.2";
+  version = "1.4.13";
   name = "electron-${version}";
 
   meta = with stdenv.lib; {
@@ -17,7 +17,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-      sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
+      sha256 = "1fd8axaln31c550dh7dnfwigrp44ahp142cklpdc57mz34xjawp3";
       name = "${name}.zip";
     };
 
@@ -45,7 +45,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
-      sha256 = "0rqlpj3400qjsfj8k4lwajrwv5l6f8mhrpvsma7p36fw5qjbwp1z";
+      sha256 = "0aa4wrba1y7pab5g6bzxagj5dfl9bqrbpj3bbi5v5gsd0h34k0yx";
       name = "${name}.zip";
     };
 

From 6d3183e7daa07d730d644803b842c0696e02f01e Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Tue, 13 Dec 2016 00:45:05 +0100
Subject: [PATCH 90/90] nghttp2: refactor (close #21029)

Turning the dependencies unrelated to the base libnghttp2 into proper
options.  vcunat modified the commit slightly.
---
 pkgs/development/libraries/nghttp2/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index f7a026c52d4..0697b05c0a5 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -2,9 +2,19 @@
 
 # Optional Dependencies
 , openssl ? null, libev ? null, zlib ? null
-#, jansson ? null, boost ? null, libxml2 ? null, jemalloc ? null
+, enableHpack ? false, jansson ? null
+, enableAsioLib ? false, boost ? null
+, enableGetAssets ? false, libxml2 ? null
+, enableJemalloc ? false, jemalloc ? null
 }:
 
+assert enableHpack -> jansson != null;
+assert enableAsioLib -> boost != null;
+assert enableGetAssets -> libxml2 != null;
+assert enableJemalloc -> jemalloc != null;
+
+with { inherit (stdenv.lib) optional; };
+
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
   version = "1.17.0";
@@ -18,7 +28,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "lib" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl libev zlib ];
+  buildInputs = [ openssl libev zlib ]
+    ++ optional enableHpack jansson
+    ++ optional enableAsioLib boost
+    ++ optional enableGetAssets libxml2
+    ++ optional enableJemalloc jemalloc;
 
   enableParallelBuilding = true;