From 3d132be83eaf353a8efa522df84aabb706f422bc Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 8 Aug 2017 01:16:52 +0000
Subject: [PATCH 001/122] nixos/ccache: init

---
 nixos/modules/module-list.nix     |  1 +
 nixos/modules/programs/ccache.nix | 83 +++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 nixos/modules/programs/ccache.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6062bf623e75..427ef7c9d9bb 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -74,6 +74,7 @@
   ./programs/bash/bash.nix
   ./programs/blcr.nix
   ./programs/browserpass.nix
+  ./programs/ccache.nix
   ./programs/cdemu.nix
   ./programs/chromium.nix
   ./programs/command-not-found/command-not-found.nix
diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix
new file mode 100644
index 000000000000..874774c72b47
--- /dev/null
+++ b/nixos/modules/programs/ccache.nix
@@ -0,0 +1,83 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.programs.ccache;
+in {
+  options.programs.ccache = {
+    # host configuration
+    enable = mkEnableOption "CCache";
+    cacheDir = mkOption {
+      type = types.path;
+      description = "CCache directory";
+      default = "/var/cache/ccache";
+    };
+    # target configuration
+    packageNames = mkOption {
+      type = types.listOf types.str;
+      description = "Nix top-level packages to be compiled using CCache";
+      default = [];
+      example = [ "wxGTK30" "qt48" "ffmpeg_3_3" "libav_all" ];
+    };
+  };
+
+  config = mkMerge [
+    # host configuration
+    (mkIf cfg.enable {
+      systemd.tmpfiles.rules = [ "d ${cfg.cacheDir} 0770 root nixbld -" ];
+
+      # "nix-ccache --show-stats" and "nix-ccache --clear"
+      security.wrappers.nix-ccache = {
+        group = "nixbld";
+        setgid = true;
+        source = pkgs.writeScript "nix-ccache.pl" ''
+          #!${pkgs.perl}/bin/perl
+
+          %ENV=( CCACHE_DIR => '${cfg.cacheDir}' );
+          sub untaint {
+            my $v = shift;
+            return '-C' if $v eq '-C' || $v eq '--clear';
+            return '-V' if $v eq '-V' || $v eq '--version';
+            return '-s' if $v eq '-s' || $v eq '--show-stats';
+            return '-z' if $v eq '-z' || $v eq '--zero-stats';
+            exec('${pkgs.ccache}/bin/ccache', '-h');
+          }
+          exec('${pkgs.ccache}/bin/ccache', map { untaint $_ } @ARGV);
+        '';
+      };
+    })
+
+    # target configuration
+    (mkIf (cfg.packageNames != []) {
+      nixpkgs.overlays = [
+        (self: super: genAttrs cfg.packageNames (pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; }))
+
+        (self: super: {
+          ccacheWrapper = super.ccacheWrapper.override {
+            extraConfig = ''
+              export CCACHE_COMPRESS=1
+              export CCACHE_DIR="${cfg.cacheDir}"
+              export CCACHE_UMASK=007
+              if [ ! -d "$CCACHE_DIR" ]; then
+                echo "====="
+                echo "Directory '$CCACHE_DIR' does not exist"
+                echo "Please create it with:"
+                echo "  sudo mkdir -m0770 '$CCACHE_DIR'"
+                echo "  sudo chown root:nixbld '$CCACHE_DIR'"
+                echo "====="
+                exit 1
+              fi
+              if [ ! -w "$CCACHE_DIR" ]; then
+                echo "====="
+                echo "Directory '$CCACHE_DIR' is not accessible for user $(whoami)"
+                echo "Please verify its access permissions"
+                echo "====="
+                exit 1
+              fi
+            '';
+          };
+        })
+      ];
+    })
+  ];
+}
\ No newline at end of file

From b23ff3e8b5f9f57742f80751a4dda34d081c9aab Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Mon, 4 Dec 2017 11:23:42 -0500
Subject: [PATCH 002/122] swagger-codegen: Init at 2.2.1

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

diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix
new file mode 100644
index 000000000000..0c3af79628e1
--- /dev/null
+++ b/pkgs/tools/networking/swagger-codegen/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "2.2.1";
+  pname = "swagger-codegen";
+  name = "${pname}-${version}";
+
+  jarfilename = "${pname}-cli-${version}.jar";
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  src = fetchurl {
+    url = "https://oss.sonatype.org/content/repositories/releases/io/swagger/${pname}-cli/${version}/${jarfilename}";
+    sha256 = "1pwxkl3r93c8hsif9xm0h1hmbjrxz1q7hr5qn5n0sni1x3c3k0d1";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    install -D "$src" "$out/share/java/${jarfilename}"
+
+    makeWrapper ${jre}/bin/java $out/bin/swagger-codegen \
+      --add-flags "-jar $out/share/java/${jarfilename}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
+    homepage = https://github.com/swagger-api/swagger-codegen;
+    license = licenses.asl20;
+    maintainers = [ maintainers.jraygauthier ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe06b11bcbc6..2f9bff81c765 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4612,6 +4612,8 @@ with pkgs;
 
   surfraw = callPackage ../tools/networking/surfraw { };
 
+  swagger-codegen = callPackage ../tools/networking/swagger-codegen { };
+
   swec = callPackage ../tools/networking/swec {
     inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent;
   };

From 23565a25749edba30a0f4d2227d7b11f33c6c61d Mon Sep 17 00:00:00 2001
From: Shaun Sharples <shaun.sharples@gmail.com>
Date: Sun, 17 Dec 2017 16:08:02 +0200
Subject: [PATCH 003/122] factorio: 0.15.37 -> 0.15.40

stable is now 0.15.40
demo: 0.15.33 -> 0.15.36
---
 pkgs/games/factorio/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index ba23db2fbdf5..ac04022a4629 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -16,9 +16,9 @@ let
   #    where the ultimate "_" (before the version) is changed to a "-".
   binDists = {
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
-      alpha    = bdist { sha256 = "0y6d7pvf3dgyll175323xp4zmrbyrjn73zrb478y1gpl6dqh064d"; fetcher = authenticatedFetch; };
-      headless = bdist { sha256 = "1agkra3qq11la307ymsfb7v358wc2s2mdpmfbc5n0sb4gnmnqazq"; };
-      demo     = bdist { sha256 = "03nwn4838yhqq0r76pf2m4wxi32rsq0knsxmq3qq4ycji89q1dyc"; version = "0.15.33"; };
+      alpha    = bdist { sha256 = "1i25q8x80qdpmf00lvml67gyklrfvmr4gfyakrx954bq8giiy4ll"; fetcher = authenticatedFetch; };
+      headless = bdist { sha256 = "0v5sypz1q6x6hi6k5cyi06f9ld0cky80l0z64psd3v2ax9hyyh8h"; };
+      demo     = bdist { sha256 = "0aca8gks7wl7yi821bcca16c94zcc41agin5j0vfz500i0sngzzw"; version = "0.15.36"; };
     };
     i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in {
       alpha    = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; };
@@ -29,7 +29,7 @@ let
   actual = binDists.${stdenv.system}.${releaseType} or (throw "Factorio: unsupported platform");
 
   bdistForArch = arch: { sha256 ? null
-                       , version ? "0.15.37"
+                       , version ? "0.15.40"
                        , fetcher ? fetchurl
                        , nameMut ? x: x
                        }:

From 205d7f6297d8d10eb4364361d6a0d1104245926e Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Fri, 1 Dec 2017 00:00:00 +0000
Subject: [PATCH 004/122] ratox: 0.2.1 -> 0.4

---
 .../instant-messengers/ratox/default.nix      | 36 +++++++++++--------
 .../instant-messengers/ratox/ldlibs.patch     |  5 +++
 pkgs/top-level/all-packages.nix               |  4 +--
 3 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch

diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index 053e8a9c9739..5d004db60e3a 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -1,28 +1,34 @@
-{ stdenv, fetchurl, libtoxcore
+{ stdenv, fetchgit, libtoxcore
 , conf ? null }:
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
-  name = "ratox-0.2.1";
+let
+  configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
+in
 
-  src = fetchurl {
-    url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz";
-    sha256 = "0xnw3zcz9frmcxqhwg38hhnsy1g5xl9yc19nl0vwi5awz8wqqy19";
+stdenv.mkDerivation rec {
+  name = "ratox-0.4";
+
+  src = fetchgit {
+    url = "git://git.2f30.org/ratox.git";
+    rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c";
+    sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5";
   };
 
+  patches = [ ./ldlibs.patch ];
+
   buildInputs = [ libtoxcore ];
 
-  configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
   preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h";
 
-  preBuild = "makeFlags=PREFIX=$out";
+  makeFlags = [ "PREFIX=$(out)" ];
 
-  meta =
-    { description = "FIFO based tox client";
-      homepage = http://ratox.2f30.org/;
-      license = licenses.isc;
-      maintainers = with maintainers; [ ehmry ];
-      platforms = platforms.linux;
-    };
+  meta = {
+    description = "FIFO based tox client";
+    homepage = http://ratox.2f30.org/;
+    license = licenses.isc;
+    maintainers = with maintainers; [ ehmry ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
new file mode 100644
index 000000000000..1406e7143107
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
@@ -0,0 +1,5 @@
+--- a/config.mk
++++ b/config.mk
+@@ -13 +13 @@ LDFLAGS  = -L/usr/local/lib
+-LDLIBS   = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread
++LDLIBS   = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10b8d72bb168..76e41d6dc2b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16541,9 +16541,7 @@ with pkgs;
 
   ratmen = callPackage ../tools/X11/ratmen {};
 
-  ratox = callPackage ../applications/networking/instant-messengers/ratox {
-    libtoxcore = libtoxcore-old;
-  };
+  ratox = callPackage ../applications/networking/instant-messengers/ratox { };
 
   ratpoison = callPackage ../applications/window-managers/ratpoison { };
 

From ea477463a2cb854a1ebf9c6694b5a0a0e1b40895 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 7 Dec 2017 16:14:28 +0000
Subject: [PATCH 005/122] libtoxcore-old: remove unused derivation

---
 .../libraries/libtoxcore/old-api.nix          | 59 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 61 deletions(-)
 delete mode 100644 pkgs/development/libraries/libtoxcore/old-api.nix

diff --git a/pkgs/development/libraries/libtoxcore/old-api.nix b/pkgs/development/libraries/libtoxcore/old-api.nix
deleted file mode 100644
index 5757e94559a8..000000000000
--- a/pkgs/development/libraries/libtoxcore/old-api.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
-, libvpx, check, libconfig, pkgconfig }:
-
-let
-  version = "4c220e336330213b151a0c20307d0a1fce04ac9e";
-  date = "20150126";
-
-in stdenv.mkDerivation rec {
-  name = "tox-core-old-${date}-${builtins.substring 0 7 version}";
-
-  src = fetchFromGitHub {
-    owner  = "irungentoo";
-    repo   = "toxcore";
-    rev    = version;
-    sha256 = "152yamak9ykl8dgkx1qzyrpa3f4xr1s8lgcb5k58r9lb1iwnhvqc";
-  };
-
-  NIX_LDFLAGS = "-lgcc_s";
-
-  postPatch = ''
-    # within Nix chroot builds, localhost is unresolvable
-    sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \
-      auto_tests/network_test.c
-    # takes WAAAY too long (~10 minutes) and would timeout
-    sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \
-      auto_tests/tox_test.c
-  '';
-
-  configureFlags = [
-    "--with-libsodium-headers=${libsodium.dev}/include"
-    "--with-libsodium-libs=${libsodium.out}/lib"
-    "--enable-ntox"
-    "--enable-daemon"
-  ];
-
-  buildInputs = [
-    autoreconfHook libsodium ncurses
-    check libconfig pkgconfig
-  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
-    libopus
-  ];
-
-  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ];
-
-  # Some tests fail randomly due to timeout. This kind of problem is well known
-  # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
-  # They don't recommend running tests on 50core machines with other cpu-bound
-  # tests running in parallel.
-  #
-  # NOTE: run the tests locally on your machine before upgrading this package!
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ viric jgeerds ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76e41d6dc2b9..919cf127f03a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9708,8 +9708,6 @@ with pkgs;
 
   libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { };
 
-  libtoxcore-old = callPackage ../development/libraries/libtoxcore/old-api.nix { };
-
   libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
 
   libtoxcore = callPackage ../development/libraries/libtoxcore { };

From bf75e9b57a53a81f3e3b440d752cdfeb672c04d7 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Mon, 18 Dec 2017 01:17:57 +0100
Subject: [PATCH 006/122] elementary-gtk-theme: init at 5.1.1

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

diff --git a/pkgs/misc/themes/elementary/default.nix b/pkgs/misc/themes/elementary/default.nix
new file mode 100644
index 000000000000..0d02b32c8ffe
--- /dev/null
+++ b/pkgs/misc/themes/elementary/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "elementary-gtk-theme-${version}";
+  version = "5.1.1";
+
+  src = fetchFromGitHub {
+    owner = "elementary";
+    repo = "stylesheet";
+    rev = version;
+    sha256 = "1749byc2lbxmprladn9n7k6jh79r8ffgayjn689gmqsrm6czsmh2";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/themes/elementary
+    cp -r gtk-* plank $out/share/themes/elementary
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GTK theme designed to be smooth, attractive, fast, and usable";
+    homepage = https://github.com/elementary/stylesheet;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ davidak ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10b8d72bb168..94fe039e9ed0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18545,6 +18545,8 @@ with pkgs;
 
   deepin-gtk-theme = callPackage ../misc/themes/deepin { };
 
+  elementary-gtk-theme = callPackage ../misc/themes/elementary { };
+
   albatross = callPackage ../misc/themes/albatross { };
 
   gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };

From 60e937b8b2eebbed521aef369fe505192bc5c7e3 Mon Sep 17 00:00:00 2001
From: Fahad Sadah <92872+fahadsadah@users.noreply.github.com>
Date: Mon, 18 Dec 2017 15:48:25 +0000
Subject: [PATCH 007/122] build-support: tidy fetchSvn

Remove old workaround rendered unnecessary by af9db522cf7053797f5d0729698cfafe47aac9be
---
 pkgs/build-support/fetchsvn/builder.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh
index 8ed30b37fc7f..c386a3f3489f 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/pkgs/build-support/fetchsvn/builder.sh
@@ -22,11 +22,7 @@ if test -z "$LC_ALL"; then
     export LC_ALL="en_US.UTF-8"
 fi;
 
-# Pipe the "p" character into Subversion to force it to accept the
-# server's certificate.  This is perfectly safe: we don't care
-# whether the server is being spoofed --- only the cryptographic
-# hash of the output matters. Pass in extra p's to handle redirects.
-printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive \
+svn export --trust-server-cert --non-interactive \
     ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \
     -r "$rev" "$url" "$out"
 

From af1327a8813669e0dee9889a2748c2dcfbb0ae52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 19 Dec 2017 18:17:52 -0200
Subject: [PATCH 008/122] ibm-plex: init at 0.5.3

---
 pkgs/data/fonts/ibm-plex/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/data/fonts/ibm-plex/default.nix

diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
new file mode 100644
index 000000000000..573cb432085e
--- /dev/null
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub }:
+
+let version = "0.5.3";
+in fetchFromGitHub rec {
+  name = "ibm-plex-${version}";
+
+  owner = "IBM";
+  repo = "type";
+  rev = "v${version}";
+  sha256 = "1im7sid3qsk4wnm0yhq9h7i50bz46jksqxv60svdfnsrwq0krd1h";
+
+  postFetch = ''
+    tar --strip-components=1 -xzvf $downloadedFile
+    mkdir -p $out/share/fonts/opentype
+    cp fonts/*/desktop/mac/*.otf $out/share/fonts/opentype/
+  '';
+
+  meta = with lib; {
+    description = "IBM Plex Typeface";
+    homepage = https://ibm.github.io/type/;
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cea7a7478add..6aadcc70673f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13558,6 +13558,8 @@ with pkgs;
 
   hanazono = callPackage ../data/fonts/hanazono { };
 
+  ibm-plex = callPackage ../data/fonts/ibm-plex { };
+
   inconsolata = callPackage ../data/fonts/inconsolata {};
   inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {};
 

From db927ea35b655129a0a6590d60ba8c53730c22c7 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 7 Nov 2017 14:47:20 +1100
Subject: [PATCH 009/122] singularity: 2.2 -> 2.4

---
 .../virtualization/singularity/default.nix    | 42 ++++++++++++++++---
 .../virtualization/singularity/env.patch      | 21 ++++++++++
 .../singularity-tools/default.nix             |  7 +++-
 3 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/virtualization/singularity/env.patch

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index ddd8cf72b93d..236cb8f31e66 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -1,20 +1,52 @@
 { stdenv
 , fetchFromGitHub
-, autoreconfHook }:
+, autoreconfHook
+, gnutar
+, which
+, gnugrep
+, coreutils
+, python
+, e2fsprogs
+, makeWrapper
+, squashfsTools
+, gzip
+, gnused
+, curl
+, utillinux
+ }:
 
 stdenv.mkDerivation rec {
   name = "singularity-${version}";
-  version = "2.2";
+  version = "2.4";
+
+  enableParallelBuilding = true;
+
+  patches = [ ./env.patch ];
+
+  preConfigure = ''
+    sed -i 's/-static//g' src/Makefile.am
+    patchShebangs .
+  '';
+
+  fixupPhase = ''
+    patchShebangs $out
+    for f in $out/libexec/singularity/helpers/help.sh $out/libexec/singularity/cli/*.exec $out/libexec/singularity/bootstrap-scripts/*.sh ; do
+      chmod a+x $f
+      sed -i 's| /sbin/| |g' $f
+      sed -i 's| /bin/bash| ${stdenv.shell}|g' $f
+      wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath buildInputs}
+    done
+  '';
 
   src = fetchFromGitHub {
     owner = "singularityware";
     repo = "singularity";
     rev = version;
-    sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px";
+    sha256 = "1hi1ag1lb2x4djbz4x34wix83ymx0g9mzn2md6yrpiflc1d85rjz";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ ];
+  nativeBuildInputs = [ autoreconfHook makeWrapper ];
+  buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux ];
 
   meta = with stdenv.lib; {
     homepage = http://singularity.lbl.gov/;
diff --git a/pkgs/applications/virtualization/singularity/env.patch b/pkgs/applications/virtualization/singularity/env.patch
new file mode 100644
index 000000000000..bc3be363bb81
--- /dev/null
+++ b/pkgs/applications/virtualization/singularity/env.patch
@@ -0,0 +1,21 @@
+diff --git a/libexec/functions b/libexec/functions
+index bc68107..6c2211c 100644
+--- a/libexec/functions
++++ b/libexec/functions
+@@ -29,16 +29,6 @@ if [ -z "${SINGULARITY_MESSAGELEVEL:-}" ]; then
+     SINGULARITY_MESSAGELEVEL=5
+ fi
+ 
+-if [ -z "${USER:-}" ]; then
+-    USER=`id -un`
+-    export USER
+-fi
+-if [ -z "${HOME:-}" ]; then
+-    HOME=`getent passwd "$USER" | cut -d : -f 6`
+-    export HOME
+-fi
+-
+-
+ message() {
+     LEVEL="${1:-}"
+     MESSAGE="${2:-}"
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index 3c27b9fc1ad9..62cf13e52021 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -61,6 +61,7 @@ rec {
             mkfs -t ext3 -b 4096 /dev/${vmTools.hd}
             mount /dev/${vmTools.hd} disk
             cd disk
+            mkdir proc sys dev
 
             # Run root script
             ${stdenv.lib.optionalString (runAsRoot != null) ''
@@ -92,8 +93,10 @@ rec {
             cd disk
 
             export PATH=$PATH:${e2fsprogs}/bin/
-            singularity create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out
-            tar -c . | singularity import $out
+            echo creating
+            singularity image.create -s $((1 + size * 4 / 1024 + ${toString extraSpace})) $out
+            echo importing
+            tar -c . | singularity image.import $out
           '');
 
     in result;

From 0f881aec23c770fb542f05431a7d669feb1172b7 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Thu, 21 Dec 2017 15:07:22 -0500
Subject: [PATCH 010/122] bind: explicitly disable lmdb

Autodetected by default (so should be disabled) but avoid finding a
broken system version.
---
 pkgs/servers/dns/bind/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index bf7a7266022e..3d8b825cc921 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     "--without-gssapi"
     "--without-idn"
     "--without-idnlib"
+    "--without-lmdb"
     "--without-pkcs11"
     "--without-purify"
     "--without-python"

From 5fc5a9f3991f5813d664166776d2f32c014cd0c2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 21 Dec 2017 23:48:49 +0100
Subject: [PATCH 011/122] gimp: remove libart dependency

The dependency is not needed since 2.5.1
---
 pkgs/applications/graphics/gimp/2.8.nix | 4 ++--
 pkgs/top-level/all-packages.nix         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index ff87b70a0c1e..a2cbffd5d217 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
 , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python2Packages, libart_lgpl, libexif, gettext, xorg
+, python2Packages, libexif, gettext, xorg
 , AppKit, Cocoa, gtk-mac-integration }:
 
 let
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
     [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo
       freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
       libmng librsvg libwmf zlib libzip ghostscript aalib jasper
-      python pygtk libart_lgpl libexif gettext xorg.libXpm
+      python pygtk libexif gettext xorg.libXpm
       wrapPython
     ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a06dff07fdae..d898cdfc8c30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15070,7 +15070,6 @@ with pkgs;
   ghq = gitAndTools.ghq;
 
   gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
-    inherit (gnome2) libart_lgpl;
     webkit = null;
     lcms = lcms2;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;

From 1b0efdf5e411df3eb58a8021d93080a8ae0d9de4 Mon Sep 17 00:00:00 2001
From: lufia <lufia@lufia.org>
Date: Fri, 22 Dec 2017 11:37:22 +0900
Subject: [PATCH 012/122] google-app-engine-go-sdk: 1.9.55 -> 1.9.61

---
 .../tools/google-app-engine-go-sdk/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index 2041491cf80d..c85186e1c0b2 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -4,17 +4,17 @@ with python27Packages;
 
 stdenv.mkDerivation rec {
   name = "google-app-engine-go-sdk-${version}";
-  version = "1.9.55";
+  version = "1.9.61";
   src =
     if stdenv.system == "x86_64-linux" then
       fetchzip {
         url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-${version}.zip";
-        sha256 = "1gwrmqs69h3wbx6z0a7shdr8gn1qiwrkvh3pg6mi7dybwmd1x61h";
+        sha256 = "1i2j9ympl1218akwsmm7yb31v0gibgpzlb657bcravi1irfv1hhs";
       }
     else
       fetchzip {
         url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_darwin_amd64-${version}.zip";
-        sha256 = "0b8r2fqg9m285ifz0jahd4wasv7cq61nr6p1k664w021r5y5lbvr";
+        sha256 = "0s8sqyc72lnc7dxd4cl559gyfx83x71jjpsld3i3nbp3mwwamczp";
       };
 
   buildInputs = [python27 makeWrapper];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     cp -r "$src" "$out/share/go_appengine"
 
     # create wrappers with correct env
-    for i in goapp appcfg.py; do
+    for i in goapp go-app-stager *.py; do
       makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \
         --prefix PATH : "${python27}/bin" \
         --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})"

From ae24c812e9a65009f7c9a1472044fe06aeef3f44 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 22 Dec 2017 13:29:04 +0000
Subject: [PATCH 013/122] zookeeper: 3.4.10 -> 3.4.11

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

diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 4e15f472744d..c90684e0fe0d 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "zookeeper-${version}";
-  version = "3.4.10";
+  version = "3.4.11";
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
-    sha256 = "09rz4ac31932yxyyc8gqrnq1zxb9ahibrq51wbz13b24w0a58zvz";
+    sha256 = "110fs5manyaq6rxbzwzs9x3aqw8d5l4177y9qaj3xhgpr2hniggn";
   };
 
   buildInputs = [ makeWrapper jre ];

From e2c6ea72a1587d977186dcad6967b3afccadc945 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 22 Dec 2017 12:19:26 +0100
Subject: [PATCH 014/122] virtualbox: 5.2.2 -> 5.2.4

---
 pkgs/applications/virtualization/virtualbox/default.nix  | 9 +++++----
 .../virtualbox/guest-additions/default.nix               | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index f99338fb406d..0d09716f8f2f 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -20,10 +20,11 @@ let
   python = python2;
   buildType = "release";
   # Manually sha256sum the extensionPack file, must be hex!
-  extpack = "9328548ca8cbc526232c0631cb5a17618c771b07665b362c1e3d89a2425bf799";
-  extpackRev = "119230";
-  main = "05y03fcp013gc500q34bj6hvx1banib41v8l3hcxknzfgwq0rarm";
-  version = "5.2.2";
+  # Do not forget to update the hash in ./guest-additions/default.nix!
+  extpack = "98e9df4f23212c3de827af9d770b391cf2dba8d21f4de597145512c1479302cd";
+  extpackRev = "119785";
+  main = "053xpf0kxrig4jq5djfz9drhkxy1x5a4p9qvgxc0b3hnk6yn1869";
+  version = "5.2.4";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 0aa0423fc13a..409187a99fbd 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1f0vm20qdjxqsbciwgybxqqpn609gj5dy68an8lpi1wlk93s05w3";
+    sha256 = "0qhsr6vc48ld2p9q3a6n6rfg57rsn163axr3r1m2yqr2snr4pnk0";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

From 035dfacf43ed95a7e7c6ea722e91d7fabab43a7f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 22 Dec 2017 12:21:08 +0100
Subject: [PATCH 015/122] virtualbox: add flokli as maintainer

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

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 0d09716f8f2f..583fb408f1ee 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -207,7 +207,7 @@ in stdenv.mkDerivation {
   meta = {
     description = "PC emulator";
     homepage = http://www.virtualbox.org/;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = with maintainers; [ flokli sander ];
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }

From eb12741c7af5c2bffd9916ec6159297ba7d51aa2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 22 Dec 2017 12:22:01 +0100
Subject: [PATCH 016/122] virtualbox: add license

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

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 583fb408f1ee..d46702d6205b 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -206,6 +206,7 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "PC emulator";
+    license = licenses.gpl2;
     homepage = http://www.virtualbox.org/;
     maintainers = with maintainers; [ flokli sander ];
     platforms = [ "x86_64-linux" "i686-linux" ];

From 0543dc77b17ea26318e96f19bfb642856b52aa65 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 23 Dec 2017 03:30:46 +0100
Subject: [PATCH 017/122] nixos/tests/virtualbox: remove mknod /dev/vda1 call

With devtmpfs introduced in 0d27df280f7ed502bba65e2ea13469069f9b275a it is
created automatically.

See https://github.com/NixOS/nixpkgs/pull/32983#issuecomment-353703083
---
 nixos/tests/virtualbox.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index c519d7dae8be..5574293ba377 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -109,9 +109,6 @@ let
   } ''
     ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
     ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
-    . /sys/class/block/vda1/uevent
-    mknod /dev/vda1 b $MAJOR $MINOR
-
     ${pkgs.e2fsprogs}/sbin/mkfs.ext4 /dev/vda1
     ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
     mkdir /mnt

From 407721b73b55d72394dabe025d741e13113aeac5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 30 Jun 2017 20:53:45 +0200
Subject: [PATCH 018/122] libmypaint: init at 1.3.0

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

diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
new file mode 100644
index 000000000000..0583d94ef7f4
--- /dev/null
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -0,0 +1,32 @@
+{stdenv, autoconf, automake, fetchFromGitHub, glib, intltool, json_c, libtool, pkgconfig}:
+
+let
+  version = "1.3.0";
+in stdenv.mkDerivation rec {
+  name = "libmypaint-${version}";
+
+  src = fetchFromGitHub {
+    owner = "mypaint";
+    repo = "libmypaint";
+    rev = "v${version}";
+    sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc";
+  };
+
+  nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ];
+
+  buildInputs = [ glib ];
+
+  propagatedBuildInputs = [ json_c ]; # for libmypaint.pc
+
+  doCheck = true;
+
+  preConfigure = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    homepage = http://mypaint.org/;
+    description = "Library for making brushstrokes which is used by MyPaint and other projects";
+    license = licenses.isc;
+    maintainers = with maintainers; [ goibhniu jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d898cdfc8c30..7bbe637dda4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9434,6 +9434,8 @@ with pkgs;
 
   libmsgpack = callPackage ../development/libraries/libmsgpack { };
 
+  libmypaint = callPackage ../development/libraries/libmypaint { };
+
   libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {
     mysql = mysql57;
   };

From 3ea18511dcca1fab6b870de28a32d48b355fc997 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 22 Dec 2017 00:24:35 +0100
Subject: [PATCH 019/122] gegl_3_0: propagate dependencies needed by pkgconfig

---
 pkgs/development/libraries/gegl/3.0.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
index 60e43f838b71..158707557a52 100644
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -20,10 +20,12 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   buildInputs = [
-    babl libpng cairo libjpeg librsvg pango gtk bzip2 json_glib
+    libpng cairo libjpeg librsvg pango gtk bzip2
     libraw libwebp gnome3.gexiv2
   ];
 
+  propagatedBuildInputs = [ glib json_glib babl ]; # for gegl-3.0.pc
+
   nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ];
 
   meta = {

From b13217b6e57ab9431265e357f34c7acdaf3e2fca Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Dec 2017 16:54:10 +0100
Subject: [PATCH 020/122] perl-HTTP-Message: 6.11 -> 6.14

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 802d777b5b2f..ea76c82d8222 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6882,14 +6882,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   HTTPMessage = buildPerlPackage rec {
-    name = "HTTP-Message-6.11";
+    name = "HTTP-Message-6.14";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b";
+      url = "mirror://cpan/authors/id/O/OA/OALDERS/${name}.tar.gz";
+      sha256 = "71aab9f10eb4b8ec6e8e3a85fc5acb46ba04db1c93eb99613b184078c5cf2ac9";
     };
+    buildInputs = [ TryTiny ];
     propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ];
     meta = {
-      description = "HTTP style messages";
+      homepage = https://github.com/libwww-perl/HTTP-Message;
+      description = "HTTP style message (base class)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };

From b322cad42bc4040b76c7e82490947aef5ac9b734 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 23 Dec 2017 17:25:19 +0100
Subject: [PATCH 021/122] nixos/rootston: Init

Probably only relevant for a quick testing setup and NixOS VM tests.
---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/programs/rootston.nix           | 88 +++++++++++++++++++
 .../development/libraries/wlroots/default.nix |  2 +
 3 files changed, 91 insertions(+)
 create mode 100644 nixos/modules/programs/rootston.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 942a7371e88f..629c8c1bc5bb 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -91,6 +91,7 @@
   ./programs/npm.nix
   ./programs/oblogout.nix
   ./programs/qt5ct.nix
+  ./programs/rootston.nix
   ./programs/screen.nix
   ./programs/slock.nix
   ./programs/shadow.nix
diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix
new file mode 100644
index 000000000000..a8fe2b22be57
--- /dev/null
+++ b/nixos/modules/programs/rootston.nix
@@ -0,0 +1,88 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.rootston;
+
+  rootstonWrapped = pkgs.writeScriptBin "rootston" ''
+    #! ${pkgs.stdenv.shell}
+    if [[ "$#" -ge 1 ]]; then
+      exec ${pkgs.rootston}/bin/rootston "$@"
+    else
+      exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile}
+    fi
+  '';
+in {
+  options.programs.rootston = {
+    enable = mkEnableOption ''
+      rootston, the reference compositor for wlroots. The purpose of rootston
+      is to test and demonstrate the features of wlroots (if you want a real
+      Wayland compositor you should e.g. use Sway instead). You can manually
+      start the compositor by running "rootston" from a terminal'';
+
+    extraPackages = mkOption {
+      type = with types; listOf package;
+      default = with pkgs; [
+        xwayland rxvt_unicode dmenu
+      ];
+      defaultText = literalExample ''
+        with pkgs; [
+          xwayland dmenu rxvt_unicode
+        ]
+      '';
+      example = literalExample "[ ]";
+      description = ''
+        Extra packages to be installed system wide.
+      '';
+    };
+
+    config = mkOption {
+      type = types.str;
+      default = ''
+        [keyboard]
+        meta-key = Logo
+
+        # Sway/i3 like Keybindings
+        # Maps key combinations with commands to execute
+        # Commands include:
+        # - "exit" to stop the compositor
+        # - "exec" to execute a shell command
+        # - "close" to close the current view
+        # - "next_window" to cycle through windows
+        [bindings]
+        Logo+Shift+e = exit
+        Logo+q = close
+        Logo+m = maximize
+        Alt+Tab = next_window
+        Logo+Return = exec urxvt
+        # Note: Dmenu will only work properly while e.g. urxvt is running.
+        Logo+d = exec dmenu_run
+      '';
+      description = ''
+        Default configuration for rootston (used when called without any
+        parameters).
+      '';
+    };
+
+    configFile = mkOption {
+      type = types.path;
+      default = "/etc/rootston.ini";
+      example = literalExample "${pkgs.rootston}/etc/rootston.ini";
+      description = ''
+        Path to the default rootston configuration file (the "config" option
+        will have no effect if you change the path).
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.etc."rootston.ini".text = cfg.config;
+    environment.systemPackages = [ rootstonWrapped ] ++ cfg.extraPackages;
+
+    hardware.opengl.enable = mkDefault true;
+    fonts.enableDefaultFonts = mkDefault true;
+  };
+
+  meta.maintainers = with lib.maintainers; [ primeos ];
+}
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 8db3c466522c..c32f0a3b9384 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -35,6 +35,8 @@ in stdenv.mkDerivation rec {
     mkdir $bin/lib
     cp libwlroots.so $bin/lib/
     patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston
+    mkdir $bin/etc
+    cp ../rootston/rootston.ini.example $bin/etc/rootston.ini
   '';
 
   meta = with stdenv.lib; {

From fac4de6aa2f8fa250414a8eaaa332621745edf0a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 23 Dec 2017 00:34:26 +0100
Subject: [PATCH 022/122] perl526: init at 5.26.1

---
 .../development/interpreters/perl/default.nix |  12 +-
 .../interpreters/perl/no-sys-dirs-5.26.patch  | 250 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 260 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 7b0ecee1922d..62c63ef6c5c3 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -32,9 +32,10 @@ let
     setOutputFlags = false;
 
     patches =
-      [ # Do not look in /usr etc. for dependencies.
-        ./no-sys-dirs.patch
-      ]
+      [ ]
+      # Do not look in /usr etc. for dependencies.
+      ++ optional (versionOlder version "5.26") ./no-sys-dirs.patch
+      ++ optional (versionAtLeast version "5.26") ./no-sys-dirs-5.26.patch
       ++ optional (versionAtLeast version "5.24") (
         # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360
         fetchurlBoot {
@@ -133,4 +134,9 @@ in rec {
     version = "5.24.3";
     sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b";
   };
+
+  perl526 = common {
+    version = "5.26.1";
+    sha256 = "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7";
+  };
 }
diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch
new file mode 100644
index 000000000000..ad65d1339f36
--- /dev/null
+++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.26.patch
@@ -0,0 +1,250 @@
+diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
+--- perl-5.20.0-orig/Configure	2014-05-26 15:34:18.000000000 +0200
++++ perl-5.20.0/Configure	2014-06-25 10:43:35.368285986 +0200
+@@ -106,15 +106,7 @@
+ fi
+ 
+ : Proper PATH setting
+-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
+-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
+-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
+-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
+-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
+-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
+-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
+-paths="$paths /sbin /usr/sbin /usr/libexec"
+-paths="$paths /system/gnu_library/bin"
++paths=''
+ 
+ for p in $paths
+ do
+@@ -1337,8 +1329,7 @@
+ archname=''
+ : Possible local include directories to search.
+ : Set locincpth to "" in a hint file to defeat local include searches.
+-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
+-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
++locincpth=""
+ :
+ : no include file wanted by default
+ inclwanted=''
+@@ -1349,17 +1340,12 @@
+ 
+ libnames=''
+ : change the next line if compiling for Xenix/286 on Xenix/386
+-xlibpth='/usr/lib/386 /lib/386'
++xlibpth=''
+ : Possible local library directories to search.
+-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
+-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
++loclibpth=""
+ 
+ : general looking path for locating libraries
+-glibpth="/lib /usr/lib $xlibpth"
+-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
+-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+-test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
+-test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
++glibpth=""
+ 
+ : Private path used by Configure to find libraries.  Its value
+ : is prepended to libpth. This variable takes care of special
+@@ -1391,8 +1377,6 @@
+ libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
+ : We probably want to search /usr/shlib before most other libraries.
+ : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
+-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
+-glibpth="/usr/shlib $glibpth"
+ : Do not use vfork unless overridden by a hint file.
+ usevfork=false
+ 
+@@ -2446,7 +2430,6 @@
+ zip
+ "
+ pth=`echo $PATH | sed -e "s/$p_/ /g"`
+-pth="$pth $sysroot/lib $sysroot/usr/lib"
+ for file in $loclist; do
+ 	eval xxx=\$$file
+ 	case "$xxx" in
+@@ -4936,7 +4919,7 @@
+ : Set private lib path
+ case "$plibpth" in
+ '') if ./mips; then
+-	plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
++	plibpth="$incpath/usr/lib"
+     fi;;
+ esac
+ case "$libpth" in
+@@ -8600,13 +8583,8 @@
+ echo " "
+ case "$sysman" in
+ '')
+-	syspath='/usr/share/man/man1 /usr/man/man1'
+-	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
+-	syspath="$syspath /usr/man/u_man/man1"
+-	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
+-	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
+-	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
+-	sysman=`./loc . /usr/man/man1 $syspath`
++	syspath=''
++	sysman=''
+ 	;;
+ esac
+ if $test -d "$sysman"; then
+@@ -19900,9 +19878,10 @@
+ case "$full_ar" in
+ '') full_ar=$ar ;;
+ esac
++full_ar=ar
+ 
+ : Store the full pathname to the sed program for use in the C program
+-full_sed=$sed
++full_sed=sed
+ 
+ : see what type gids are declared as in the kernel
+ echo " "
+Only in perl-5.20.0/: Configure.orig
+diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL
+--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL	2014-05-26 15:34:20.000000000 +0200
++++ perl-5.20.0/ext/Errno/Errno_pm.PL	2014-06-25 10:31:24.317970047 +0200
+@@ -126,11 +126,7 @@
+ 	if ($dep =~ /(\S+errno\.h)/) {
+ 	     $file{$1} = 1;
+ 	}
+-    } elsif ($^O eq 'linux' &&
+-	      $Config{gccversion} ne '' && 
+-	      $Config{gccversion} !~ /intel/i
+-	      # might be using, say, Intel's icc
+-	     ) {
++    } elsif (0) {
+     # When cross-compiling we may store a path for gcc's "sysroot" option:
+     my $sysroot = $Config{sysroot} || '';
+ 	# Some Linuxes have weird errno.hs which generate
+Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
+diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh
+--- perl-5.20.0-orig/hints/freebsd.sh	2014-01-31 22:55:51.000000000 +0100
++++ perl-5.20.0/hints/freebsd.sh	2014-06-25 10:25:53.263964680 +0200
+@@ -119,21 +119,21 @@
+         objformat=`/usr/bin/objformat`
+         if [ x$objformat = xaout ]; then
+             if [ -e /usr/lib/aout ]; then
+-                libpth="/usr/lib/aout /usr/local/lib /usr/lib"
+-                glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
++                libpth=""
++                glibpth=""
+             fi
+             lddlflags='-Bshareable'
+         else
+-            libpth="/usr/lib /usr/local/lib"
+-            glibpth="/usr/lib /usr/local/lib"
++            libpth=""
++            glibpth=""
+             ldflags="-Wl,-E "
+             lddlflags="-shared "
+         fi
+         cccdlflags='-DPIC -fPIC'
+         ;;
+ *)
+-       libpth="/usr/lib /usr/local/lib"
+-       glibpth="/usr/lib /usr/local/lib"
++       libpth=""
++       glibpth=""
+        ldflags="-Wl,-E "
+         lddlflags="-shared "
+         cccdlflags='-DPIC -fPIC'
+diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
+--- perl-5.20.0-orig/hints/linux.sh	2014-05-26 15:34:20.000000000 +0200
++++ perl-5.20.0/hints/linux.sh	2014-06-25 10:33:47.354883843 +0200
+@@ -150,25 +150,6 @@
+     ;;
+ esac
+ 
+-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
+-# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
+-# where to look.  We don't want gcc's own libraries, however, so we
+-# filter those out.
+-# This could be conditional on Unbuntu, but other distributions may
+-# follow suit, and this scheme seems to work even on rather old gcc's.
+-# This unconditionally uses gcc because even if the user is using another
+-# compiler, we still need to find the math library and friends, and I don't
+-# know how other compilers will cope with that situation.
+-# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
+-# we don't want its libraries. So we try to prefer the system gcc
+-# Still, as an escape hatch, allow Configure command line overrides to
+-# plibpth to bypass this check.
+-if [ -x /usr/bin/gcc ] ; then
+-    gcc=/usr/bin/gcc
+-else
+-    gcc=gcc
+-fi
+-
+ case "$plibpth" in
+ '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
+ 	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
+@@ -178,32 +159,6 @@
+     ;;
+ esac
+ 
+-case "$libc" in
+-'')
+-# If you have glibc, then report the version for ./myconfig bug reporting.
+-# (Configure doesn't need to know the specific version since it just uses
+-# gcc to load the library for all tests.)
+-# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
+-# are insufficiently precise to distinguish things like
+-# libc-2.0.6 and libc-2.0.7.
+-    for p in $plibpth
+-    do
+-        for trylib in libc.so.6 libc.so
+-        do
+-            if $test -e $p/$trylib; then
+-                libc=`ls -l $p/$trylib | awk '{print $NF}'`
+-                if $test "X$libc" != X; then
+-                    break
+-                fi
+-            fi
+-        done
+-        if $test "X$libc" != X; then
+-            break
+-        fi
+-    done
+-    ;;
+-esac
+-
+ if ${sh:-/bin/sh} -c exit; then
+   echo ''
+   echo 'You appear to have a working bash.  Good.'
+@@ -367,33 +322,6 @@
+ 	;;
+ esac
+ 
+-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
+-# true libraries. The scripts cause binding against static
+-# version of -lgdbm which is a bad idea. So if we have 'nm'
+-# make sure it can read the file
+-# NI-S 2003/08/07
+-case "$nm" in
+-    '') ;;
+-    *)
+-    for p in $plibpth
+-    do
+-        if $test -r $p/libndbm.so; then
+-            if $nm $p/libndbm.so >/dev/null 2>&1 ; then
+-                echo 'Your shared -lndbm seems to be a real library.'
+-                _libndbm_real=1
+-                break
+-            fi
+-        fi
+-    done
+-    if $test "X$_libndbm_real" = X; then
+-        echo 'Your shared -lndbm is not a real library.'
+-        set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
+-        shift
+-        libswanted="$*"
+-    fi
+-    ;;
+-esac
+-
+ # Linux on Synology.
+ if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
+     # Tested on Synology DS213 and DS413
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4130aecc0d33..184d60a6cc1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6716,7 +6716,7 @@ with pkgs;
 
   ocropus = callPackage ../applications/misc/ocropus { };
 
-  inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524;
+  inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 

From 428708feba163ca069cd9d1fe4809c857c2b353c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 23 Dec 2017 20:25:54 +0100
Subject: [PATCH 023/122] scowl: init at 2017.08.24

---
 pkgs/data/misc/scowl/default.nix | 101 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |   2 +
 2 files changed, 103 insertions(+)
 create mode 100644 pkgs/data/misc/scowl/default.nix

diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix
new file mode 100644
index 000000000000..2769ed1a166a
--- /dev/null
+++ b/pkgs/data/misc/scowl/default.nix
@@ -0,0 +1,101 @@
+{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "scowl";
+  version = "2017.08.24";
+
+  src = fetchFromGitHub {
+    owner = "en-wl";
+    repo = "wordlist";
+    rev = "rel-${version}";
+    sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz";
+  };
+
+  buildInputs = [];
+  nativeBuildInputs = [unzip zip perl aspell dos2unix];
+
+  NIX_CFLAGS_COMPILE = " -Wno-narrowing ";
+
+  preConfigure = ''
+    patchShebangs .
+    export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$PWD/varcon"
+  '';
+
+  postBuild = ''
+    (
+    cd scowl/speller
+    make aspell
+    make hunspell
+    )
+  '';
+
+  enableParallelBuilding = false;
+
+  installPhase = ''
+    eval "$preInstall"
+
+    mkdir -p "$out/share/scowl" 
+    mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell" 
+    mkdir -p "$out/share/dict"
+
+    cp -r scowl/speller/aspell "$out/lib/aspell"
+    cp scowl/speller/*.{aff,dic} "$out/share/hunspell"
+    ln -s "$out/share/hunspell" "$out/share/myspell/dicts"
+
+    cp scowl/final/* "$out/share/scowl"
+
+    (
+      cd scowl
+      for region in american british british_s british_z canadian australian; do
+        case $region in
+          american)
+            regcode=en-us;
+            ;;
+          british)
+            regcode=en-gb-ise;
+            ;;
+          british_s)
+            regcode=en-gb-ise;
+            ;;
+          british_z)
+            regcode=en-gb-ize;
+            ;;
+          canadian)
+            regcode=en-ca;
+            ;;
+          australian)
+            regcode=en-au;
+            ;;
+        esac
+        regcode_var="$regcode"
+        if test "$region" = british; then
+          regcode_var="en-gb"
+        fi
+
+        echo $region $regcode $regcode_sz
+        for s in 10 20 30 35 40 50 55 60 70 80 90; do
+          ./mk-list $regcode $s > "$out/share/dict/w$region.$s"
+          ./mk-list --variants=1 $regcode_var $s > "$out/share/dict/w$region.variants.$s"
+          ./mk-list --variants=2 $regcode_var $s > "$out/share/dict/w$region.acceptable.$s"
+        done
+        ./mk-list $regcode 60 > "$out/share/dict/w$region.txt"
+        ./mk-list --variants=1 $regcode_var 60 > "$out/share/dict/w$region.variants.txt"
+        ./mk-list --variants=2 $regcode_var 80 > "$out/share/dict/w$region.scrabble.txt"
+      done
+      ./mk-list --variants=1 en-gb 60 > "$out/share/dict/words.variants.txt"
+      ./mk-list --variants=1 en-gb 80 > "$out/share/dict/words.scrabble.txt"
+      ./mk-list en-gb-ise 60 > "$out/share/dict/words.txt"
+    )
+
+    eval "$postInstall"
+  '';
+
+  meta = {
+    inherit version;
+    description = "Spell checker oriented word lists";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.unix;
+    homepage = "http://wordlist.aspell.net/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 184d60a6cc1b..5442f5a5f6bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13730,6 +13730,8 @@ with pkgs;
 
   sampradaya = callPackage ../data/fonts/sampradaya { };
 
+  scowl = callPackage ../data/misc/scowl { };
+
   shaderc = callPackage ../development/compilers/shaderc { };
 
   mime-types = callPackage ../data/misc/mime-types { };

From 589d4640fb154873feaf7167f13555d653aa2a6d Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Sat, 23 Dec 2017 16:02:47 -0500
Subject: [PATCH 024/122] pycuda: fix boost_python3 link

Boost python library now named -lboost_python3 on py3.
Remove a couple unused inputs.
---
 pkgs/development/python-modules/pycuda/default.nix | 5 ++---
 pkgs/top-level/python-packages.nix                 | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index 0bd8800eddcb..eb7459b07792 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -13,8 +13,7 @@
 , python
 , mkDerivation
 , stdenv
-, pythonOlder
-, isPy35
+, isPy3k
 }:
 let
   compyte = import ./compyte.nix {
@@ -35,7 +34,7 @@ buildPythonPackage rec {
     ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \
                           --boost-lib-dir=${boost}/lib \
                           --no-use-shipped-boost \
-                          --boost-python-libname=boost_python
+                          --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"}
   '';
 
   postInstall = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f438a643703..80fbc3d544c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6524,7 +6524,6 @@ in {
   pycuda = callPackage ../development/python-modules/pycuda rec {
     cudatoolkit = pkgs.cudatoolkit75;
     inherit (pkgs.stdenv) mkDerivation;
-    inherit pythonOlder;
   };
 
   pyphen = callPackage ../development/python-modules/pyphen {};

From 6f2530912267864b401a0c06683e533b0d5a9fdb Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 23 Dec 2017 17:48:41 -0500
Subject: [PATCH 025/122] lhapdf: 6.2.0 -> 6.2.1

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

diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 1a203172d2c8..93e0fa99c347 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lhapdf-${version}";
-  version = "6.2.0";
+  version = "6.2.1";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
-    sha256 = "0gfjps7v93n0rrdndkhp22d93y892bf76pnzdhqbish0cigkkxph";
+    sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd";
   };
 
   buildInputs = [ python2 ];

From 9e69322761e06d31cc711c91a46c65d2fa42f96a Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 23 Dec 2017 18:12:34 -0500
Subject: [PATCH 026/122] yoda: 1.6.7 -> 1.7.0

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

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index dd1b33056468..7519d0da03fc 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, withRootSupport ? false }:
+{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }:
 
 stdenv.mkDerivation rec {
   name = "yoda-${version}";
-  version = "1.6.7";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    sha256 = "05jyv5dypa6d4q1m8wm2qycgq1i0bgzwzzm9qqdj0b43ff2kggra";
+    sha256 = "0fyf6ld1klzlfmr5sl1jxzck4a0h14zfkrff8397rn1fqnqbzmmk";
   };
 
   pythonPath = []; # python wrapper support
 
   buildInputs = with python2Packages; [ python numpy matplotlib makeWrapper ]
     ++ stdenv.lib.optional withRootSupport root;
+  propagatedBuildInputs = [ zlib ];
 
   enableParallelBuilding = true;
 

From e272f56f933db00f52168997e4e4390620d86987 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 23 Dec 2017 18:13:03 -0500
Subject: [PATCH 027/122] rivet: 2.5.4 -> 2.6.0

---
 .../libraries/physics/rivet/default.nix         | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 3e80e5758522..5d533d4250aa 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rivet-${version}";
-  version = "2.5.4";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    sha256 = "1qi7am60f2l4krd3sbj95mbzfk82lir0wy8z27yr9ncq6qcm48kp";
+    sha256 = "1mvsa3v8d1pl2fj1dcdf8sikzm1yb2jcl0q34fyfsjw2cisxpv5f";
   };
 
-  postPatch = "patchShebangs ./src/Analyses/cat_with_lines";
-
   patches = [
     ./darwin.patch # configure relies on impure sw_vers to -Dunix
   ];
@@ -29,6 +27,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ hepmc imagemagick python2 latex makeWrapper ];
   propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
 
+  preConfigure = ''
+    substituteInPlace bin/rivet-buildplugin.in \
+      --replace '"which"' '"${which}/bin/which"' \
+      --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"}  #' \
+      --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "
+  '';
+
   preInstall = ''
     substituteInPlace bin/make-plots \
       --replace '"which"' '"${which}/bin/which"' \
@@ -40,10 +45,6 @@ stdenv.mkDerivation rec {
       --replace '"convert"' '"${imagemagick.out}/bin/convert"'
     substituteInPlace bin/rivet \
       --replace '"less"' '"${less}/bin/less"'
-    substituteInPlace bin/rivet-buildplugin \
-      --replace '"which"' '"${which}/bin/which"' \
-      --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"}  #' \
-      --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "
     substituteInPlace bin/rivet-mkhtml \
       --replace '"make-plots"' \"$out/bin/make-plots\" \
       --replace '"rivet-cmphistos"' \"$out/bin/rivet-cmphistos\"

From a8433be79b8ac76b28693f52830b687776c9e52d Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 23 Dec 2017 18:18:50 -0500
Subject: [PATCH 028/122] telegraf: 1.4.4 -> 1.5.0

---
 pkgs/servers/monitoring/telegraf/default.nix  |  4 +-
 .../{deps-1.4.4.nix => deps-1.5.0.nix}        | 47 +++++++++++++++----
 2 files changed, 39 insertions(+), 12 deletions(-)
 rename pkgs/servers/monitoring/telegraf/{deps-1.4.4.nix => deps-1.5.0.nix} (93%)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index f71ed052d04e..d5411e40a399 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "telegraf-${version}";
-  version = "1.4.4";
+  version = "1.5.0";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "${version}";
-    sha256 = "1hyjbx0hwyh39dgij86xlznaqnzh8m0yk96phqgxs328dlcxfl07";
+    sha256 = "0h3v80qvb9xmkmgbp46sqh76y4k84c0da586vdy3xmmbrbagnypv";
   };
 
   buildFlagsArray = [ ''-ldflags=
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.4.4.nix b/pkgs/servers/monitoring/telegraf/deps-1.5.0.nix
similarity index 93%
rename from pkgs/servers/monitoring/telegraf/deps-1.4.4.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.5.0.nix
index 0cfcf03dd148..916b4688a06e 100644
--- a/pkgs/servers/monitoring/telegraf/deps-1.4.4.nix
+++ b/pkgs/servers/monitoring/telegraf/deps-1.5.0.nix
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/Shopify/sarama";
-      rev = "c01858abb625b73a3af51d0798e4ad42c8147093";
-      sha256 = "139fyfi2h6qas83kan0kpm9d92985nl1fyhijswy37d6ia86797w";
+      rev = "3b1b38866a79f06deddf0487d5c27ba0697ccd65";
+      sha256 = "02qwlqd1kdgwlv39fimpbzjhgw8shzkkad82kfwdy8lppscb20br";
     };
   }
   {
@@ -77,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bsm/sarama-cluster";
-      rev = "ccdc0803695fbce22f1706d04ded46cd518fd832";
-      sha256 = "1jbb03bygjzzs6wyxp6cp057kyiyv80schwlhgi366nizp52hd56";
+      rev = "abf039439f66c1ce78017f560b490612552f6472";
+      sha256 = "16013ac7jv72mdiv84vhk4av1vb5q8xq3fhv253fz2a17h9ld78q";
     };
   }
   {
@@ -126,6 +126,15 @@
       sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
     };
   }
+  {
+    goPackagePath = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29";
+      sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs";
+    };
+  }
   {
     goPackagePath = "github.com/docker/docker";
     fetch = {
@@ -275,8 +284,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/jackc/pgx";
-      rev = "b84338d7d62598f75859b2b146d830b22f1b9ec8";
-      sha256 = "13q763a31yya8ij6m5zbnri7wc88hjwwn1rw4v7dmwbwsrqn885c";
+      rev = "63f58fd32edb5684b9e9f4cfaac847c6b42b3917";
+      sha256 = "1n9cbdwzpagnrisxwq0frqdnkmyfg2qlxsr890527d32633hp0h2";
     };
   }
   {
@@ -324,6 +333,24 @@
       sha256 = "1v7rccng7mbzqh5qf8d8gqfppm127v32s8i1n3k50q3flv227byf";
     };
   }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "d0303fe809921458f417bcf828397a65db30a7e4";
+      sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
+    };
+  }
+  {
+    goPackagePath = "github.com/multiplay/go-ts3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/multiplay/go-ts3";
+      rev = "07477f49b8dfa3ada231afc7b7b17617d42afe8e";
+      sha256 = "1z2cfqhm6g48vzscargw6vl9idfppdcm3wq1xfwy73l1s77q4n9n";
+    };
+  }
   {
     goPackagePath = "github.com/naoina/go-stringutil";
     fetch = {
@@ -365,8 +392,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsqio/go-nsq";
-      rev = "a53d495e81424aaf7a7665a9d32a97715c40e953";
-      sha256 = "04npqz6ajr4r2w5jfvfzppr307qrwr57w4c1ppq9p9ddf7hx3wpz";
+      rev = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f";
+      sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x";
     };
   }
   {
@@ -482,8 +509,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev = "48fc5612898a1213aa5d6a0fb2d4f7b968e898fb";
-      sha256 = "14mwpxd2v3y4mr0g37g99vhy9jkaaaw29d3j7427rpv568vyb8sd";
+      rev = "384a55110aa5ae052eb93ea94940548c1e305a99";
+      sha256 = "00idmnsmalxhm1y60lhm9vyck1ay7gbp0r35fgs8bbiwq351bs23";
     };
   }
   {

From a9ae16c2b92e2a808a93223435c308174ed398de Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 24 Dec 2017 00:40:01 +0000
Subject: [PATCH 029/122] doc: fix typo

---
 doc/shell.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/shell.md b/doc/shell.md
index a4f999695cbc..079574d4ae86 100644
--- a/doc/shell.md
+++ b/doc/shell.md
@@ -1,10 +1,10 @@
 ---
-title: stdenv.mkShell
+title: pkgs.mkShell
 author: zimbatm
 date: 2017-10-30
 ---
 
-stdenv.mkShell is a special kind of derivation that is only useful when using
+pkgs.mkShell is a special kind of derivation that is only useful when using
 it combined with nix-shell. It will in fact fail to instantiate when invoked
 with nix-build.
 

From 41d9818c86dc4e42d4977a912d8b3090765975e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Dec 2017 13:46:49 -0200
Subject: [PATCH 030/122] mate-settings-daemon: 1.18.1 -> 1.18.2

---
 pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index ffa01d1dba88..86eec907651c 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   name = "mate-settings-daemon-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "1";
+  minor-ver = "2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "07b2jkxqv07njdrgkdck93d872p6lch1lrvi7ydnpicspg3rfid6";
+    sha256 = "0v2kdzfmfqq0avlrxnxysmkawy83g7sanmyhivisi5vg4rzsr0a4";
   };
 
   nativeBuildInputs = [

From 8f9d37a31a85b9a1b66391a05be52649d1e3b1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Dec 2017 23:15:17 -0200
Subject: [PATCH 031/122] caja: 1.18.3 -> 1.18.5

---
 pkgs/desktops/mate/caja/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index 8f38a5ef7e69..d0383fcc5eb8 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "caja-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "3";
+  minor-ver = "5";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm";
+    sha256 = "1ild2bslvnvxvl5q2xc1sa8bz1lyr4q4ksw3bwxrj0ymc16h7p50";
   };
 
   nativeBuildInputs = [

From 06439e3a55dea220b672752a8cbfe2e1cc6b1610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Dec 2017 23:54:40 -0200
Subject: [PATCH 032/122] caja-extensions: 1.18.1 -> 1.18.2

---
 pkgs/desktops/mate/caja-extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index ab2831159f90..d3b2a558bc9f 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "caja-extensions-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "1";
+  minor-ver = "2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0hgala7zkfsa60jflq3s4n9yd11dhfdcla40l83cmgc3r1az7cmw";
+    sha256 = "065j3dyk7zp35rfvxxsdglx30i3xrma4d4saf7mn1rn1akdfgaba";
   };
 
   nativeBuildInputs = [

From f64ab6aa0d3bb67740858185ede0e3ee77d16e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Dec 2017 23:55:14 -0200
Subject: [PATCH 033/122] engrampa: 1.18.2 -> 1.18.3

---
 pkgs/desktops/mate/engrampa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 026890829890..b6b60fa24380 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "engrampa-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "2";
+  minor-ver = "3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0d98zhqqc7qdnxcf0195kd04xmhijc0w2qrn6q61zd0daiswnv98";
+    sha256 = "1ms6kz8k86hsj9zk5w3087l749022y0j5ba2s9hz8ah6gfx0mvn5";
   };
 
   nativeBuildInputs = [

From 4ac84e3087ccb2ed4b26f388e6c7e7e4b4a226a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Dec 2017 23:55:46 -0200
Subject: [PATCH 034/122] eom: 1.18.2 -> 1.18.3

---
 pkgs/desktops/mate/eom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index c7651e1b5be8..b7df66d520b1 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "eom-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "2";
+  minor-ver = "3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "00ns7g7qykakc89lijrw2vwy9x9ijqiyvmnd4sw0j6py90zs8m87";
+    sha256 = "1zr85ilv0f4x8iky002qvh00qhsq1vsfm5z1954gf31hi57z2j25";
   };
 
   nativeBuildInputs = [

From dca85966a6957b979a3478a291c25fd9bb98af4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Dec 2017 23:56:15 -0200
Subject: [PATCH 035/122] libmateweather: 1.18.1 -> 1.18.2

---
 pkgs/desktops/mate/libmateweather/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 4d7c9dd61d6d..3ddbb8f6a02a 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "libmateweather-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "1";
+  minor-ver = "2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0z6vfh42fv9rqjrraqfpf6h9nd9h662bxy3l3r48j19xvxrwmx3a";
+    sha256 = "1q3rvmm533cgiif9hbdp6a92dm727g5i2dv5d8krfa0nl36i468y";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 238eb2be73878eee6264ab9672f856689a167dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Dec 2017 23:56:40 -0200
Subject: [PATCH 036/122] marco: 1.18.1 -> 1.18.2

---
 pkgs/desktops/mate/marco/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 1846bccacefb..522485fd22c2 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "marco-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "1";
+  minor-ver = "2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0lwbp9wyd66hl5d7g272l8g3k1pb9s4s2p9fb04750a58w87d8k5";
+    sha256 = "173g9mrnkcgjc6a1maln13iqdl0cqcnca8ydr8767xrn9dlkx9f5";
   };
 
   nativeBuildInputs = [

From 5253294f8f1639f34b4d9cb999c42d5ecbd5463d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Dec 2017 23:57:27 -0200
Subject: [PATCH 037/122] mate-media: 1.18.0 -> 1.18.2

---
 pkgs/desktops/mate/mate-media/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 039db57aebbe..0586a2e54ebf 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-media-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "0";
+  minor-ver = "2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0v19aipqj24367mx82ghkvgnxy1505zd35h50pi30fws36b6plll";
+    sha256 = "07v37jvrl8m5rhlasrdziwy15gcpn561d7zn5q1yfla2d5ddy0b1";
   };
 
   buildInputs = [

From acfc6218cc973be2aefb66c48aa163b717fff944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 23 Dec 2017 23:57:54 -0200
Subject: [PATCH 038/122] mate-menus: 1.18.0 -> 1.18.1

---
 pkgs/desktops/mate/mate-menus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index a3da557f2a21..6f4bf48c672a 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-menus-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "0";
+  minor-ver = "1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "05kyr37xqv6hm1rlvnqd5ng0x1n883brqynkirkk5drl56axnz7h";
+    sha256 = "03fwv0fvg073dmdbrcbpwjhxpj98aqna804m9nqybhvj3cfyhaz6";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From de8df90bda310b9d67cd1b9ffc98d6f41254774e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 00:00:20 -0200
Subject: [PATCH 039/122] mate-notification-daemon: 1.18.0 -> 1.18.1

---
 pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 5a64727419c6..c5e53cf57914 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
   name = "mate-notification-daemon-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "0";
+  minor-ver = "1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0rhhv99ipxy7l4fdgwvqp3g0c3d4njq0fhkag2vs1nwc6kx0h7sc";
+    sha256 = "102nmd6mnf1fwvw11ggdlgcblq612nd4aar3gdjzqn1fw37591i5";
   };
 
   nativeBuildInputs = [

From 6ee3ad16ae492133631e3fe20070d1bec8ff32b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 00:00:50 -0200
Subject: [PATCH 040/122] mate-panel: 1.18.4 -> 1.18.6

---
 pkgs/desktops/mate/mate-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index d3e6f11fd947..1ca20047fa18 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-panel-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "4";
+  minor-ver = "6";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1n565ff1n7jrfx223i3cl3m69wjda506nvbn8gra7m1jwdfzpbw1";
+    sha256 = "0cyfqq7i3qilw6qfxay4j9rl9y03s611nrqy5bh7lkdx1y0l16kx";
   };
 
   nativeBuildInputs = [

From 0a8326f20de66cb71e100f8449bc28ad8a34637c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 00:01:46 -0200
Subject: [PATCH 041/122] mate-power-manager: 1.18.0 -> 1.18.1

---
 pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 62b991632840..8b60226d9590 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-power-manager-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "0";
+  minor-ver = "1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1gmka9ybxvkrdjaga1md6pbw6q1cx5yxb58ai5315a0f5p45y36x";
+    sha256 = "1sybc4j9bdnb2axmvpbbm85ixhdfa1k1yh769gns56ix0ryd9nr5";
   };
 
   buildInputs = [

From ccb7cdd5b13cef2a6ccf71a285121b3e70512321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 00:02:35 -0200
Subject: [PATCH 042/122] mate-session-manager: 1.18.1 -> 1.18.2

---
 pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 48d2890388a7..6b4abbeff00a 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-session-manager-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "1";
+  minor-ver = "2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "0i0xq6041x2qmb26x9bawx0qpfkgjn6x9w3phnm9s7rc4s0z20ll";
+    sha256 = "11ii7azl8rn9mfymcmcbpysyd12vrxp4s8l3l6yk4mwlr3gvzxj0";
   };
 
   nativeBuildInputs = [

From 24b4a7f09ef60fb808453fe26ace134143de882e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 24 Dec 2017 09:39:51 +0800
Subject: [PATCH 043/122] sblim-sfcc: minor cleanups

---
 .../libraries/sblim-sfcc/default.nix          | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix
index 016cc6f0472f..ba0b8f4e996f 100644
--- a/pkgs/development/libraries/sblim-sfcc/default.nix
+++ b/pkgs/development/libraries/sblim-sfcc/default.nix
@@ -1,30 +1,28 @@
-{ fetchgit, stdenv, autoconf, automake, libtool, curl }:
+{ stdenv, fetchFromGitHub, autoreconfHook, curl }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.9";
   name = "sblim-sfcc-${version}";
+  version = "2.2.9"; # this is technically 2.2.9-preview
 
-  src = fetchgit {
-    url = "https://github.com/kkaempf/sblim-sfcc.git";
-    rev = "f70fecb410a53531e4fe99d39cf81b581819cac9";
-    sha256 = "1hsxim284qzldh599gf6khxj80g8q5263xl3lj3hdndxbhbs843v";
+  src = fetchFromGitHub {
+    owner  = "kkaempf";
+    repo   = "sblim-sfcc";
+    rev    = "514a76af2020fd6dc6fc380df76cbe27786a76a2";
+    sha256 = "06c1mskl9ixbf26v88w0lvn6v2xd6n5f0jd5mckqrn9j4vmh70hs";
   };
 
-  preConfigure = "./autoconfiscate.sh";
+  buildInputs = [ curl ];
 
-  buildInputs = [ autoconf automake libtool curl ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  meta = {
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
     description = "Small Footprint CIM Client Library";
-
-    homepage = https://sourceforge.net/projects/sblim/;
-
-    maintainers = [ stdenv.lib.maintainers.deepfire ];
-
-    license = stdenv.lib.licenses.cpl10;
-
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-
+    homepage    = https://sourceforge.net/projects/sblim/;
+    license     = licenses.cpl10;
+    maintainers = with maintainers; [ deepfire ];
+    platforms   = platforms.unix;
     inherit version;
   };
 }

From ede3aea02a31b57333dfbc1b3d5c5bca9ae0ac31 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 24 Dec 2017 09:46:53 +0800
Subject: [PATCH 044/122] openwsman: 2.6.0 -> 2.6.5

---
 .../libraries/openwsman/default.nix           | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix
index b179ca8803c1..df2c23266c50 100644
--- a/pkgs/development/libraries/openwsman/default.nix
+++ b/pkgs/development/libraries/openwsman/default.nix
@@ -1,16 +1,20 @@
-{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, libxml2, curl, cmake, pam, sblim-sfcc }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, curl, libxml2, pam, sblim-sfcc }:
 
 stdenv.mkDerivation rec {
-  version = "2.6.0";
   name = "openwsman-${version}";
+  version = "2.6.5";
 
-  src = fetchurl {
-    url = "https://github.com/Openwsman/openwsman/archive/v${version}.tar.gz";
-    sha256 = "0gw2dsjxzpchg3s85kplwgp9xhd9l7q4fh37iy7r203pvir4k6s4";
+  src = fetchFromGitHub {
+    owner  = "Openwsman";
+    repo   = "openwsman";
+    rev    = "v${version}";
+    sha256 = "1r0zslgpcr4m20car4s3hsccy10xcb39qhpw3dhpjv42xsvvs5xv";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake libtool libxml2 curl cmake pam sblim-sfcc ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ curl libxml2 pam sblim-sfcc ];
 
   cmakeFlags = [
     "-DCMAKE_BUILD_RUBY_GEM=no"
@@ -22,18 +26,13 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-more-warnings";
 
-  meta = {
-    description = "Openwsman server implementation and client api with bindings";
-
-    homepage = https://github.com/Openwsman/openwsman;
-    downloadPage = "https://github.com/Openwsman/openwsman/releases";
-
-    maintainers = [ stdenv.lib.maintainers.deepfire ];
-
-    license = stdenv.lib.licenses.bsd3;
-
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-
+  meta = with stdenv.lib; {
+    description  = "Openwsman server implementation and client API with bindings";
+    downloadPage = https://github.com/Openwsman/openwsman/releases;
+    homepage     = https://openwsman.github.io;
+    license      = licenses.bsd3;
+    maintainers  = with maintainers; [ deepfire ];
+    platforms    = platforms.unix;
     inherit version;
   };
 }

From da0d8e2174785f2ebe69fe884102ab8f6fcba985 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 24 Dec 2017 10:03:16 +0800
Subject: [PATCH 045/122] wsmancli: clean-ups

---
 pkgs/tools/system/wsmancli/default.nix | 53 +++++++++++---------------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix
index bd6ec17ceec1..ca35dae5827c 100644
--- a/pkgs/tools/system/wsmancli/default.nix
+++ b/pkgs/tools/system/wsmancli/default.nix
@@ -1,45 +1,36 @@
-{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, openwsman, openssl }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, openssl, openwsman }:
 
 stdenv.mkDerivation rec {
-  version = "2.6.0";
   name = "wsmancli-${version}";
+  version = "2.6.0";
 
-  src = fetchurl {
-    url = "https://github.com/Openwsman/wsmancli/archive/v${version}.tar.gz";
-    sha256 = "03ay6sa4ii8h6rr3l2qiqqml8xl6gplrlg4v2avdh9y6sihfyvvn";
+  src = fetchFromGitHub {
+    owner  = "Openwsman";
+    repo   = "wsmancli";
+    rev    = "v${version}";
+    sha256 = "0a67fz9lj7xkyfqim6ai9kj7v6hzx94r1bg0g0l5dymgng648b9j";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake libtool openwsman openssl ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  preConfigure = ''
-    ./bootstrap
+  buildInputs = [ openwsman openssl ];
 
-    configureFlagsArray=(
-      LIBS="-L${openssl.out}/lib -lssl -lcrypto"
-    )
+  postPatch = ''
+    touch AUTHORS NEWS README
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Openwsman command-line client";
-
-    longDescription =
-      '' Openwsman provides a command-line tool, wsman, to perform basic
-         operations on the command-line. These operations include Get, Put,
-         Invoke, Identify, Delete, Create, and Enumerate. The command-line tool
-         also has several switches to allow for optional features of the
-         WS-Management specification and Testing.
-      '';
-
-    homepage = https://github.com/Openwsman/wsmancli;
-    downloadPage = "https://github.com/Openwsman/wsmancli/releases";
-
-    maintainers = [ stdenv.lib.maintainers.deepfire ];
-
-    license = stdenv.lib.licenses.bsd3;
-
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-
+    longDescription = ''
+      Openwsman provides a command-line tool, wsman, to perform basic
+      operations on the command-line. These operations include Get, Put,
+      Invoke, Identify, Delete, Create, and Enumerate. The command-line tool
+      also has several switches to allow for optional features of the
+      WS-Management specification and Testing.
+    '';
+    downloadPage = https://github.com/Openwsman/wsmancli/releases;
+    inherit (openwsman.meta) homepage license maintainers platforms;
     inherit version;
   };
 }

From cb5417ace0ea6cdc7cbac26997aeb3ddc56d1795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 00:03:10 -0200
Subject: [PATCH 046/122] mate-terminal: 1.18.1 -> 1.18.2

---
 pkgs/desktops/mate/mate-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index 9d620b283018..590ae7c7f813 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "mate-terminal-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "1";
+  minor-ver = "2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1";
+    sha256 = "053jdcjalywcq4fvqlb145sfp5hmnd6yyk9ckzvkh6fl3gyp54gc";
   };
 
   buildInputs = [

From 45c4bdbc5832683dbd086aa2982a05a8f169563e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 00:04:04 -0200
Subject: [PATCH 047/122] mate-themes: 3.22.13 -> 3.22.14

---
 pkgs/desktops/mate/mate-themes/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index a80c54803d80..c29c0560cd1d 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -7,15 +7,15 @@ stdenv.mkDerivation rec {
   # There is no 3.24 release.
   major-ver = if stdenv.lib.versionOlder gnome3.version "3.23" then gnome3.version else "3.22";
   minor-ver = {
-    "3.20" = "22";
-    "3.22" = "13";
+    "3.20" = "23";
+    "3.22" = "14";
   }."${major-ver}";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz";
     sha256 = {
-      "3.20" = "1yjj5w7zvyjyg0k21nwk438jjsnj0qklsf0z5pmmp1jff1vxyck4";
-      "3.22" = "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i";
+      "3.20" = "0xmcm1kmkhbakhwy5vvx3gll5v2gvihwnbf0gyjf75fys6h3818g";
+      "3.22" = "09fqvlnmrvc73arl7jv9ygkxi46lw7c1q8qra6w3ap7x83f9zdak";
     }."${major-ver}";
   };
 

From 5aa32d732e8bd3f612b19e51194a0741e997b6b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 00:04:33 -0200
Subject: [PATCH 048/122] pluma: 1.18.2 -> 1.18.3

---
 pkgs/desktops/mate/pluma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index a290c404469c..d6d3d46f7cd6 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   name = "pluma-${version}";
   version = "${major-ver}.${minor-ver}";
   major-ver = "1.18";
-  minor-ver = "2";
+  minor-ver = "3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1z0938yiygxipj2a77n9dv8v4253snrc5gbbnarcnim9xba2j3zz";
+    sha256 = "1bz2jvjfz761hcvhcbkz8sc4xf0iyixh5w0k7bx69qkwwdc0gxi0";
   };
 
   nativeBuildInputs = [

From 69daf1235b9c9779ed6bc4ce4eb1285555db3a56 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 24 Dec 2017 04:40:02 +0000
Subject: [PATCH 049/122] python.pkgs.ansi: move to python-modules and fix test
 with python3

---
 pkgs/development/python-modules/ansi/default.nix | 15 +++++++++++++++
 pkgs/top-level/python-packages.nix               | 10 +---------
 2 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/python-modules/ansi/default.nix

diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix
new file mode 100644
index 000000000000..a79de55d2eb0
--- /dev/null
+++ b/pkgs/development/python-modules/ansi/default.nix
@@ -0,0 +1,15 @@
+{ buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "ansi";
+  version = "0.1.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06y6470bzvlqys3zi2vc68rmk9n05v1ibral14gbfpgfa8fzy7pg";
+  };
+
+  checkPhase = ''
+    python -c "import ansi.color"
+  '';
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80fbc3d544c3..6a9c2ff5716e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22840,15 +22840,7 @@ EOF
     doCheck = false;
   };
 
-  ansi = buildPythonPackage rec {
-    name = "ansi-${version}";
-    version = "0.1.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/ansi/${name}.tar.gz";
-      sha256 = "06y6470bzvlqys3zi2vc68rmk9n05v1ibral14gbfpgfa8fzy7pg";
-    };
-  };
+  ansi = callPackage ../development/python-modules/ansi { };
 
   pygments-markdown-lexer = buildPythonPackage rec {
     name = "pygments-markdown-lexer-${version}";

From c92e5f87abced143f7cf084fed5dccf883537a54 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 24 Dec 2017 04:21:00 +0000
Subject: [PATCH 050/122] python.pkgs.routes: update dependencies

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a9c2ff5716e..3d52230635c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16289,14 +16289,15 @@ in {
   routes = buildPythonPackage rec {
     pname = "Routes";
     version = "2.4.1";
-    name = "${pname}-${version}";
 
     src = fetchPypi {
       inherit pname version;
       sha256 = "1zamff3m0kc4vyfniyhxpkkcqv1rrgnmh37ykxv34nna1ws47vi6";
     };
 
-    propagatedBuildInputs = with self; [ paste webtest repoze_lru ];
+    propagatedBuildInputs = with self; [ repoze_lru six webob ];
+
+    checkInputs = with self; [ coverage webtest ];
 
     meta = {
       description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions";

From f0af122022428def96a5f1cd5e58c217febacfd9 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 24 Dec 2017 03:56:17 +0000
Subject: [PATCH 051/122] python.pkgs.more-itertools: 2.4.1 -> 4.0.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 3d52230635c3..349950f6e8b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22969,11 +22969,11 @@ EOF
 
   more-itertools = buildPythonPackage rec {
     name = "more-itertools-${version}";
-    version = "2.4.1";
+    version = "4.0.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/m/more-itertools/${name}.tar.gz";
-      sha256 = "95a222d01df60c888d56d86f91219bfbd47106a534e89ca7f80fb555cfbe08c1";
+      sha256 = "0cadwsr97c80k18if7qy5d8j8l1zj3yhnkm6kbngk0lpl7pxq8ax";
     };
 
     buildInputs = with self; [ nose ];

From 3f68db5212d00d4d5eb2fab6583d7e7c4c62fad2 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 24 Dec 2017 04:00:12 +0000
Subject: [PATCH 052/122] python.pkgs.cheroot: 5.8.3 -> 6.0.0

---
 .../development/python-modules/cheroot/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 8447f7fea50c..d1ecfcc5c89c 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -1,20 +1,22 @@
 { stdenv, fetchPypi, buildPythonPackage
-, six
+, more-itertools, six
 , coverage, codecov, pytest, pytestcov, pytest-sugar, portend
 , backports_unittest-mock, setuptools_scm }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "cheroot";
-  version = "5.8.3";
+  version = "6.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5c0531fd732700b1fb3e6e7079dc3aefbdf29e9136925633d93f009cb87d70a3";
+    sha256 = "10s67wxymk4xg45l7ca59n4l6m6rnj8b9l52pg1angxh958lwixs";
   };
 
-  propagatedBuildInputs = [ six ];
-  buildInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock setuptools_scm ];
+  propagatedBuildInputs = [ more-itertools six ];
+
+  buildInputs = [ setuptools_scm ];
+
+  checkInputs = [ coverage codecov pytest pytestcov pytest-sugar portend backports_unittest-mock  ];
 
   checkPhase = ''
     py.test cheroot

From 7952288ac348a0d13e373e3060b199b9c1754f7e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 24 Dec 2017 04:03:44 +0000
Subject: [PATCH 053/122] python.pkgs.cherrypy: 11.0.0 -> 13.1.0

---
 .../python-modules/cherrypy/default.nix       | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index cffffde8e3d1..5711cdba2b5b 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -1,23 +1,30 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
-, pytest, setuptools_scm, pytestrunner
-, six, cheroot, portend }:
+{ lib, buildPythonPackage, fetchPypi
+, cheroot, portend, routes, six
+, setuptools_scm
+, backports_unittest-mock, codecov, coverage, objgraph, pathpy, pytest, pytest-sugar, pytestcov
+}:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "CherryPy";
-  version = "11.0.0";
+  version = "13.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1037pvhab4my791vfzikm649ny52fj7x2q87cnncmbnqin6ghwan";
+    sha256 = "0pb9mfmhns33jq4nrd38mv88ha74fj3q0y2mm8qsjh7ywphvk9ap";
   };
 
-  # wsgiserver.ssl_pyopenssl is broken on py3k.
-  doCheck = !isPy3k;
-  buildInputs = [ pytest setuptools_scm pytestrunner ];
-  propagatedBuildInputs = [ six cheroot portend ];
+  propagatedBuildInputs = [ cheroot portend routes six ];
 
-  meta = with stdenv.lib; {
+  buildInputs = [ setuptools_scm ];
+
+  checkInputs = [ backports_unittest-mock codecov coverage objgraph pathpy pytest pytest-sugar pytestcov ];
+
+  checkPhase = ''
+    LANG=en_US.UTF-8 pytest
+  '';
+
+  meta = with lib; {
     homepage = "http://www.cherrypy.org";
     description = "A pythonic, object-oriented HTTP framework";
     license = licenses.bsd3;

From 9bfc02a34a986aaac732aa31a959f09177494084 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 24 Dec 2017 04:49:32 +0000
Subject: [PATCH 054/122] python.pkgs.eventlib: disable check phase

activated by #32244
---
 pkgs/top-level/python-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 349950f6e8b0..2f0bbdd9dc73 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4740,6 +4740,8 @@ in {
 
     propagatedBuildInputs = with self; [ greenlet ];
 
+    doCheck = false;
+
     meta = {
       description = "Eventlib bindings for python";
       homepage    = "http://ag-projects.com/";

From 6275b083f842760c2a1c3458157575a6af797ad9 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Mon, 18 Dec 2017 08:15:40 +1100
Subject: [PATCH 055/122] python.pkgs.sip: 4.19.3 -> 4.19.6

---
 pkgs/development/python-modules/sip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index af885fcf5a2a..77857df0764f 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,13 +2,13 @@
 
 if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {
   pname = "sip";
-  version = "4.19.3";
+  version = "4.19.6";
   name = "${pname}-${version}";
   format = "other";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
-    sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
+    sha256 = "0nlj0zbvmzliyhhspqwf2bjvcnpq4agx4s47php7ishv32p2gnlx";
   };
 
   configurePhase = ''

From 67b997c8f000668f02bde0d2300e470ac4af66e7 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Mon, 18 Dec 2017 08:16:03 +1100
Subject: [PATCH 056/122] python.pkgs.pyqt5: 5.9 -> 5.9.2

Supports up to version Qt 5.9.3
---
 pkgs/development/python-modules/pyqt/5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index dc5c964caf6d..053824ef8e95 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "PyQt";
-  version = "5.9";
+  version = "5.9.2";
 
   inherit (pythonPackages) buildPythonPackage python dbus-python sip;
 in buildPythonPackage {
@@ -25,7 +25,7 @@ in buildPythonPackage {
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
-    sha256 = "15hh4z5vd45dcswjla58q6rrfr6ic7jfz2n7c8lwfb10rycpj3mb";
+    sha256 = "15439gxari6azbfql20ksz8h4gv23k3kfyjyr89h2yy9k32xm461";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper qmake ];

From 159a72bd553c039e8898430bc5391d2b03baa8f8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 24 Dec 2017 05:15:58 +0000
Subject: [PATCH 057/122] python.pkgs.bitcoinlib: support darwin

---
 pkgs/development/python-modules/bitcoinlib/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix
index 99d943862aba..b012fd24aa01 100644
--- a/pkgs/development/python-modules/bitcoinlib/default.nix
+++ b/pkgs/development/python-modules/bitcoinlib/default.nix
@@ -1,6 +1,7 @@
-{ lib, buildPythonPackage, fetchFromGitHub, openssl }:
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, openssl }:
 
-buildPythonPackage rec {
+let ext = if stdenv.isDarwin then "dylib" else "so";
+in buildPythonPackage rec {
   pname = "bitcoinlib";
   version = "0.9.0";
   name = "${pname}-${version}";
@@ -15,7 +16,7 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace bitcoin/core/key.py --replace \
       "ctypes.util.find_library('ssl') or 'libeay32'" \
-      "\"${openssl.out}/lib/libssl.so\""
+      "'${openssl.out}/lib/libssl.${ext}'"
   '';
 
   meta = {

From 5e38fc024b24586168ef417aced5a26b498f3718 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 23 Dec 2017 22:16:48 -0800
Subject: [PATCH 058/122] mwprocapture: 1.2.3589 -> 1.2.3773

also refactor linux 4.14 patch, and remove 4.13 patch as it is upstream
---
 .../linux/mwprocapture/default.nix            |  9 +++---
 .../linux/mwprocapture/linux_4_13_fix.patch   | 12 --------
 .../linux/mwprocapture/linux_4_14_fix.patch   | 28 +++++++++++++------
 3 files changed, 23 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch

diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
index f61611fbf017..322d0260f7b6 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -18,15 +18,14 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mwprocapture-1.2.${version}-${kernel.version}";
-  version = "3589";
+  version = "3773";
 
   src = fetchurl {
-    url = "http://www.magewell.com/files/ProCaptureForLinux_${version}.tar.gz";
-    sha256 = "1arwnwrq52rs8g9zfxw8saip40vc3201sf7qnbqd2p23h8vzwb8i";
+    url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz";
+    sha256 = "1ri7c4l4xgkhpz0f15jra1p7mpzi8ir6lpwjm7q7hc9m4cvxcs1g";
   };
 
-  patches = [] ++ optional (versionAtLeast kernel.version "4.13") ./linux_4_13_fix.patch
-               ++ optional (versionAtLeast kernel.version "4.14") ./linux_4_14_fix.patch;
+  patches = [ ./linux_4_14_fix.patch ];
 
   preConfigure =
   ''
diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch
deleted file mode 100644
index 925af61b49a0..000000000000
--- a/pkgs/os-specific/linux/mwprocapture/linux_4_13_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur ProCaptureForLinux_3589/src/sources/ospi/ospi-linux.h ProCaptureForLinux_3589_new/src/sources/ospi/ospi-linux.h
---- ProCaptureForLinux_3589/src/sources/ospi/ospi-linux.h	2017-08-17 02:46:07.000000000 -0700
-+++ ProCaptureForLinux_3589_new/src/sources/ospi/ospi-linux.h	2017-09-03 18:13:31.843510536 -0700
-@@ -172,7 +172,7 @@
- #else
-     struct completion       done;
- #endif
--    wait_queue_t            waitq; // for multi wait
-+    wait_queue_entry_t      waitq; // for multi wait
- };
- typedef struct _os_event_t *os_event_t;
- 
diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
index 9f92a38bcc45..c01e2a4ef466 100644
--- a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
+++ b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
@@ -1,6 +1,6 @@
-diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.c ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c
---- ProCaptureForLinux_3589/src/sources/ospi/linux-file.c	2017-08-17 02:46:07.000000000 -0700
-+++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.c	2017-11-13 20:18:50.842947380 -0800
+diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c
+--- ProCaptureForLinux_3773/src/sources/ospi/linux-file.c	2017-12-15 01:59:57.000000000 -0800
++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c	2017-12-23 22:14:08.351092413 -0800
 @@ -7,8 +7,8 @@
  
  #include "linux-file.h"
@@ -11,41 +11,51 @@ diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.c ProCaptureForLi
  
  struct file *linux_file_open(const char *path, int flags, int mode)
  {
-@@ -28,27 +28,27 @@
+@@ -28,29 +28,36 @@
      filp_close(file, NULL);
  }
  
 -ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size)
 +ssize_t linux_file_read(struct file *file, loff_t offset, const void *data, size_t size)
  {
++#if defined(HAVE_KERNEL_WRITE_PPOS)
++    return(kernel_read(file, data, size, &offset));
++#else
      mm_segment_t oldfs;
      ssize_t ret;
  
      oldfs = get_fs();
      set_fs(get_ds());
 -    ret = vfs_read(file, data, size, &offset);
-+    ret = kernel_read(file, data, size, &offset);
++    ret = vfs_read(file, (unsigned char *)data, size, &offset);
      set_fs(oldfs);
  
      return ret;
++#endif
  }
  
 -ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size)
 +ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size)
  {
++#if defined(HAVE_KERNEL_WRITE_PPOS)
++    return(kernel_write(file, data, size, &offset));
++#else
      mm_segment_t oldfs;
      ssize_t ret;
  
      oldfs = get_fs();
      set_fs(get_ds());
 -    ret = vfs_write(file, data, size, &offset);
-+    ret = kernel_write(file, data, size, &offset);
++    ret = vfs_write(file, (unsigned char *)data, size, &offset);
      set_fs(oldfs);
  
      return ret;
-diff -Naur ProCaptureForLinux_3589/src/sources/ospi/linux-file.h ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.h
---- ProCaptureForLinux_3589/src/sources/ospi/linux-file.h	2017-08-17 02:46:07.000000000 -0700
-+++ ProCaptureForLinux_3589_new/src/sources/ospi/linux-file.h	2017-11-13 20:24:20.979690346 -0800
++#endif
+ }
+-
+diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.h ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h
+--- ProCaptureForLinux_3773/src/sources/ospi/linux-file.h	2017-12-15 01:59:57.000000000 -0800
++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h	2017-12-23 21:57:18.263237473 -0800
 @@ -13,9 +13,9 @@
  
  void linux_file_close(struct file *file);

From a5d44f6631cf0dd09747bb1018c740a417161df7 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Sun, 9 Jul 2017 18:31:51 -0500
Subject: [PATCH 059/122] wxGTK31: init at 3.1

wxgtk31: overrideattrs
---
 .../libraries/wxwidgets/3.1/default.nix          | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                  |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/wxwidgets/3.1/default.nix

diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix
new file mode 100644
index 000000000000..4b410a307bb4
--- /dev/null
+++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchFromGitHub
+, wxGTK30
+}:
+
+with stdenv.lib;
+
+wxGTK30.overrideAttrs (oldAttrs : rec {
+    name = "wxwidgets-${version}";
+    version = "3.1.0";
+    src = fetchFromGitHub {
+        owner = "wxWidgets";
+        repo = "wxWidgets";
+        rev = "v${version}";
+        sha256 = "14kl1rsngm70v3mbyv1mal15iz2b18k97avjx8jn7s81znha1c7f";
+    };
+})
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27097f8fed41..1a14ed49c815 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11222,6 +11222,8 @@ with pkgs;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
+  wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 {};
+
   wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
     inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
     inherit (darwin.stubs) setfile rez derez;

From 1e5973850e4589a65863e242431c029c6fc69bb4 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Thu, 20 Jul 2017 19:24:20 -0500
Subject: [PATCH 060/122] dolphinEmuMaster: convert cmakeFlags to list

---
 pkgs/misc/emulators/dolphin-emu/master.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 41dbfd1999c4..b7a37e25b700 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0pr5inkd7swc6s7im7axhvmkdbqidhrha2wpflnr25aiwq0dzm10";
   };
 
-  cmakeFlags = ''
-    -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-    -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-    -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-    -DENABLE_LTO=True
-  '';
+  cmakeFlags = [
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
+    "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
+    "-DENABLE_LTO=True"
+  ];
 
   enableParallelBuilding = true;
 

From 1852176d2e93e6d9617de63b0648c544b1217ec7 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Thu, 20 Jul 2017 19:15:04 -0500
Subject: [PATCH 061/122] dolphinEmuMaster: move inputs to nativeBuildInputs

- add Darwin inputs
- Add curl to prevent in-tree build
- add libpng hidapi wxgtk for dolphin to use
---
 pkgs/misc/emulators/dolphin-emu/master.nix | 24 +++++++++++++++-------
 pkgs/top-level/all-packages.nix            |  7 +++++--
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index b7a37e25b700..7cbe87a7cfc1 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,7 +1,14 @@
-{ stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
 , pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline
-, openal, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
-, libpulseaudio ? null }:
+, openal, libXdmcp, portaudio, libusb, libevdev
+, libpulseaudio ? null
+, curl
+# - Inputs used for Darwin
+, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL
+, wxGTK
+, libpng
+, hidapi
+}:
 
 stdenv.mkDerivation rec {
   name = "dolphin-emu-20170902";
@@ -17,14 +24,17 @@ stdenv.mkDerivation rec {
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
     "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
     "-DENABLE_LTO=True"
-  ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ];
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ curl ffmpeg libao mesa gtk2 glib pcre
                   gettext libpthreadstubs libXrandr libXext libSM readline openal
-                  libevdev libXdmcp portaudio libusb libpulseaudio ];
+                  libXdmcp portaudio libusb libpulseaudio libpng hidapi
+                ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
+                  ++ stdenv.lib.optionals stdenv.isLinux  [ bluez libevdev  ];
 
   meta = {
     homepage = http://dolphin-emu.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a14ed49c815..5c1fc21c4d61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1839,8 +1839,11 @@ with pkgs;
   dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
 
   dolphinEmu = callPackage ../misc/emulators/dolphin-emu { };
-  dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { };
-
+  dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix {
+    inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
+    inherit (darwin) cf-private;
+    wxGTK = wxGTK31;
+  };
   doomseeker = callPackage ../applications/misc/doomseeker { };
 
   slade = callPackage ../applications/misc/slade {

From 6d63847041d5c6ccb77b0794a30314ebce4be7ce Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Thu, 20 Jul 2017 22:57:31 -0500
Subject: [PATCH 062/122] dolphinEmuMaster: Create darwin outpath

---
 pkgs/misc/emulators/dolphin-emu/master.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 7cbe87a7cfc1..4fb21fda8d8f 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -35,6 +35,9 @@ stdenv.mkDerivation rec {
                   libXdmcp portaudio libusb libpulseaudio libpng hidapi
                 ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
                   ++ stdenv.lib.optionals stdenv.isLinux  [ bluez libevdev  ];
+  preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    mkdir -p "$out/Applications"
+  '';
 
   meta = {
     homepage = http://dolphin-emu.org/;

From a44253ec65858e4103e7e0e7f3660af7c8b3d173 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Thu, 20 Jul 2017 22:57:57 -0500
Subject: [PATCH 063/122] dolphinEmuMaster: allow Dolphin to use nix-provided
 deps

---
 pkgs/misc/emulators/dolphin-emu/master.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 4fb21fda8d8f..8275952d2eed 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -35,6 +35,15 @@ stdenv.mkDerivation rec {
                   libXdmcp portaudio libusb libpulseaudio libpng hidapi
                 ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
                   ++ stdenv.lib.optionals stdenv.isLinux  [ bluez libevdev  ];
+
+  # - Change install path to Applications relative to $out
+  # - Allow Dolphin to use nix-provided libraries instead of building them
+  preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i -e 's,/Applications,Applications,g' Source/Core/DolphinWX/CMakeLists.txt
+    sed -i -e 's,if(LIBUSB_FOUND AND NOT APPLE),if(LIBUSB_FOUND),g' CMakeLists.txt
+    sed -i -e 's,if(NOT APPLE),if(true),g' CMakeLists.txt
+  '';
+
   preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     mkdir -p "$out/Applications"
   '';

From 51e53e0a71daea98efccd98b258fcbd61fb68a1b Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Sat, 11 Nov 2017 13:46:53 -0600
Subject: [PATCH 064/122] dolphinEmuMaster: Add options to build gui with wx or
 qt

---
 pkgs/misc/emulators/dolphin-emu/master.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 8275952d2eed..88e2bb1a459b 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -3,12 +3,21 @@
 , openal, libXdmcp, portaudio, libusb, libevdev
 , libpulseaudio ? null
 , curl
+
+, qt5
 # - Inputs used for Darwin
 , CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL
 , wxGTK
 , libpng
 , hidapi
+
+# options
+, dolphin-wxgui ? true
+, dolphin-qtgui ? false
 }:
+# XOR: ensure only wx XOR qt are enabled
+assert dolphin-wxgui || dolphin-qtgui;
+assert !(dolphin-wxgui && dolphin-qtgui);
 
 stdenv.mkDerivation rec {
   name = "dolphin-emu-20170902";
@@ -24,7 +33,8 @@ stdenv.mkDerivation rec {
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
     "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
     "-DENABLE_LTO=True"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ];
+  ] ++ stdenv.lib.optionals (!dolphin-qtgui)  [ "-DENABLE_QT2=False" ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ];
 
   enableParallelBuilding = true;
 
@@ -34,7 +44,8 @@ stdenv.mkDerivation rec {
                   gettext libpthreadstubs libXrandr libXext libSM readline openal
                   libXdmcp portaudio libusb libpulseaudio libpng hidapi
                 ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
-                  ++ stdenv.lib.optionals stdenv.isLinux  [ bluez libevdev  ];
+                  ++ stdenv.lib.optionals stdenv.isLinux  [ bluez libevdev  ]
+                  ++ stdenv.lib.optionals dolphin-qtgui [ qt5.qtbase ];
 
   # - Change install path to Applications relative to $out
   # - Allow Dolphin to use nix-provided libraries instead of building them

From 18a1943ad80163a1d595ad7652728be5f51c1b7e Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Thu, 20 Jul 2017 19:29:23 -0500
Subject: [PATCH 065/122] dolphinEmuMaster: enable Darwin building (x64 only)

---
 pkgs/misc/emulators/dolphin-emu/master.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 88e2bb1a459b..f6030700d2d5 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
     # x86_32 is an unsupported platform.
     # Enable generic build if you really want a JIT-less binary.
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }

From 5379bb4def4b3b655e69a501646661c240211f05 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Sat, 11 Nov 2017 13:46:20 -0600
Subject: [PATCH 066/122] dolphinEmuMaster: 20170902 -> 20171218

---
 pkgs/misc/emulators/dolphin-emu/master.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index f6030700d2d5..c18a63f720dd 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,12 +20,12 @@ assert dolphin-wxgui || dolphin-qtgui;
 assert !(dolphin-wxgui && dolphin-qtgui);
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20170902";
+  name = "dolphin-emu-20171218";
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "b073db51e5f3df8c9890e09a3f4f8a2276c31e3f";
-    sha256 = "0pr5inkd7swc6s7im7axhvmkdbqidhrha2wpflnr25aiwq0dzm10";
+    rev = "438e8b64a4b080370c7a65ed23af52838a4e7aaa";
+    sha256 = "0rrd0g1vg9jk1p4wdr6w2z34cabb7pgmpwfcl2a372ark3vi4ysc";
   };
 
   cmakeFlags = [
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
     description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
+    branch = "master";
     # x86_32 is an unsupported platform.
     # Enable generic build if you really want a JIT-less binary.
     platforms = [ "x86_64-linux" "x86_64-darwin" ];

From ac4a225488f69f1ec1c82af66a57d813c5a3ce27 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 23 Dec 2017 22:50:23 -0800
Subject: [PATCH 067/122] mwprocapture: fix linux 4.14 patch

---
 .../linux/mwprocapture/linux_4_14_fix.patch   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
index c01e2a4ef466..94da5a00a2e2 100644
--- a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
+++ b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
@@ -1,24 +1,25 @@
 diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c
 --- ProCaptureForLinux_3773/src/sources/ospi/linux-file.c	2017-12-15 01:59:57.000000000 -0800
-+++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c	2017-12-23 22:14:08.351092413 -0800
-@@ -7,8 +7,8 @@
++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c	2017-12-23 22:47:33.666823299 -0800
+@@ -7,8 +7,9 @@
  
  #include "linux-file.h"
  
 -#include <asm/uaccess.h>
  #include <linux/sched.h>
 +#include <asm/uaccess.h>
++#include <linux/version.h>
  
  struct file *linux_file_open(const char *path, int flags, int mode)
  {
-@@ -28,29 +28,36 @@
+@@ -28,29 +29,36 @@
      filp_close(file, NULL);
  }
  
 -ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size)
-+ssize_t linux_file_read(struct file *file, loff_t offset, const void *data, size_t size)
++ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size)
  {
-+#if defined(HAVE_KERNEL_WRITE_PPOS)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
 +    return(kernel_read(file, data, size, &offset));
 +#else
      mm_segment_t oldfs;
@@ -37,7 +38,7 @@ diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLi
 -ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size)
 +ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size)
  {
-+#if defined(HAVE_KERNEL_WRITE_PPOS)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
 +    return(kernel_write(file, data, size, &offset));
 +#else
      mm_segment_t oldfs;
@@ -46,7 +47,7 @@ diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLi
      oldfs = get_fs();
      set_fs(get_ds());
 -    ret = vfs_write(file, data, size, &offset);
-+    ret = vfs_write(file, (unsigned char *)data, size, &offset);
++    ret = vfs_write(file, (const unsigned char *)data, size, &offset);
      set_fs(oldfs);
  
      return ret;
@@ -55,13 +56,13 @@ diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLi
 -
 diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.h ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h
 --- ProCaptureForLinux_3773/src/sources/ospi/linux-file.h	2017-12-15 01:59:57.000000000 -0800
-+++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h	2017-12-23 21:57:18.263237473 -0800
++++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h	2017-12-23 22:46:22.028545189 -0800
 @@ -13,9 +13,9 @@
  
  void linux_file_close(struct file *file);
  
 -ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size);
-+ssize_t linux_file_read(struct file *file, loff_t offset, const void *data, size_t size);
++ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size);
  
 -ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size);
 +ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size);

From d54ff360f511b03f4da6da4976d0df43a4796968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 Dec 2017 11:08:30 +0100
Subject: [PATCH 068/122] python*Packages.gssapi: fixup after splitting libkrb

/cc #29785.
---
 pkgs/development/python-modules/gssapi/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 7b90f10338cb..3b13f8a20497 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -11,7 +11,13 @@ buildPythonPackage rec {
     sha256 = "1q6ccpz6anl9vggwxdq32wp6xjh2lyfbf7av6jqnmvmyqdfwh3b9";
   };
 
-  LD_LIBRARY_PATH="${pkgs.krb5Full}/lib";
+  # It's used to locate headers
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'"
+  '';
+
+  LD_LIBRARY_PATH = "${pkgs.krb5Full}/lib";
 
   buildInputs = [ krb5Full which nose shouldbe ]
   ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] );

From ced4e5a6831e57b48f06abc6b4a0251d0ee8764f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 Dec 2017 11:09:24 +0100
Subject: [PATCH 069/122] darwin stdenv boostrap tools: use curl without
 kerberos

/cc #29785.  Otherwise we would have to put the lib in, etc.
---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 5d5a3a81d44b..6fb37f249144 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -15,6 +15,9 @@ in rec {
   # Avoid debugging larger changes for now.
   bzip2_ = bzip2.override (args: { linkStatic = true; });
 
+  # Avoid messing with libkrb5.
+  curl_ = curl.override (args: { gssSupport = false; });
+
   build = stdenv.mkDerivation {
     name = "stdenv-bootstrap-tools";
 
@@ -60,8 +63,8 @@ in rec {
 
       # This used to be in-nixpkgs, but now is in the bundle
       # because I can't be bothered to make it partially static
-      cp ${curl.bin}/bin/curl $out/bin
-      cp -d ${curl.out}/lib/libcurl*.dylib $out/lib
+      cp ${curl_.bin}/bin/curl $out/bin
+      cp -d ${curl_.out}/lib/libcurl*.dylib $out/lib
       cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib
       cp -d ${openssl.out}/lib/*.dylib $out/lib
 

From b792b3ca614ebccf1f92b686e57999ecbb2f2775 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Sun, 24 Dec 2017 12:54:43 +0000
Subject: [PATCH 070/122] thinkfan: proper case in IBM, Lenovo, ThinkPad

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

diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index 018e82e58a3d..5a898631e090 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -55,7 +55,7 @@ in {
       enable = mkOption {
         default = false;
         description = ''
-          Whether to enable thinkfan, fan controller for ibm/lenovo thinkpads.
+          Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads.
         '';
       };
 

From ae03a11c86398dd5eee048b13f0430ace00408be Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 23 Dec 2017 17:14:46 +0100
Subject: [PATCH 071/122] liblouis: init at 3.4.0

---
 .../libraries/liblouis/default.nix            | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/libraries/liblouis/default.nix

diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
new file mode 100644
index 000000000000..d3ddb99adada
--- /dev/null
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -0,0 +1,57 @@
+{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, gettext, python3
+, texinfo, help2man, libyaml, perl
+}:
+
+let
+  version = "3.4.0";
+in stdenv.mkDerivation rec {
+  name = "liblouis-${version}";
+
+  src = fetchFromGitHub {
+    owner = "liblouis";
+    repo = "liblouis";
+    rev = "v${version}";
+    sha256 = "1b3vf6sq2iffdvj0r2q5g5k198camy3sq2nwfz391brpwivsnayh";
+  };
+
+  outputs = [ "out" "dev" "man" "info" "doc" ];
+
+  nativeBuildInputs = [
+    autoreconfHook pkgconfig gettext python3
+    # Docs, man, info
+    texinfo help2man
+  ];
+
+  buildInputs = [
+    # lou_checkYaml
+    libyaml
+    # maketable.d
+    perl
+  ];
+
+  configureFlags = [
+    # Required by Python bindings
+    "--enable-ucs4"
+  ];
+
+  postPatch = ''
+    patchShebangs tests
+    substituteInPlace python/louis/__init__.py.in --replace "###LIBLOUIS_SONAME###" "$out/lib/liblouis.so"
+  '';
+
+  postInstall = ''
+    pushd python
+    python setup.py install --prefix="$out" --optimize=1
+    popd
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Open-source braille translator and back-translator";
+    homepage = http://liblouis.org/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 119afec8fa5b..3da75c9420e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3188,6 +3188,8 @@ with pkgs;
 
   libite = callPackage ../development/libraries/libite { };
 
+  liblouis = callPackage ../development/libraries/liblouis { };
+
   liboauth = callPackage ../development/libraries/liboauth { };
 
   libsidplayfp = callPackage ../development/libraries/libsidplayfp { };

From ed26bc5931ec487ee1f5622e6bac02e8f75377a6 Mon Sep 17 00:00:00 2001
From: Dmitry Moskowski <me@corpix.ru>
Date: Sun, 24 Dec 2017 14:57:14 +0000
Subject: [PATCH 072/122] sshd: Start after network target

---
 nixos/modules/services/networking/ssh/sshd.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index f0fddcca766f..aa9c0fa1c09f 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -248,13 +248,10 @@ in
       let
         service =
           { description = "SSH Daemon";
-
             wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
-
+            after = [ "network.target" ];
             stopIfChanged = false;
-
             path = [ cfgc.package pkgs.gawk ];
-
             environment.LD_LIBRARY_PATH = nssModulesPath;
 
             preStart =

From 5a1d3097878af45e4b41d4ac5cf55c7fccd7a8d3 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Sun, 24 Dec 2017 11:29:51 +0800
Subject: [PATCH 073/122] crystal: 0.23.1 -> 0.24.1

---
 .../development/compilers/crystal/default.nix | 40 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 7bb0ed1bf617..3c3124cea174 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -2,29 +2,33 @@
 
 stdenv.mkDerivation rec {
   name = "crystal-${version}";
-  version = "0.23.1";
+  version = "0.24.1";
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "8cf1b9a4eab29fca2f779ea186ae18f7ce444ce189c621925fa1a0c61dd5ff55";
+    sha256 = "1n375cwzb9rfqbjiimfbj4h5q4rsgh2rf6rmm2zbzizzm79a96a9";
   };
 
-  prebuiltName = "crystal-0.23.0-1";
+  prebuiltName = "crystal-0.24.1-2";
   prebuiltSrc = let arch = {
     "x86_64-linux" = "linux-x86_64";
     "i686-linux" = "linux-i686";
     "x86_64-darwin" = "darwin-x86_64";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   in fetchurl {
-    url = "https://github.com/crystal-lang/crystal/releases/download/0.23.0/${prebuiltName}-${arch}.tar.gz";
+    url = "https://github.com/crystal-lang/crystal/releases/download/v0.24.1/${prebuiltName}-${arch}.tar.gz";
     sha256 = {
-      "x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx";
-      "i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a";
-      "x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz";
+      "x86_64-linux" = "19xchfzsyxh0gqi89y6d73iqc06bl097idz6905jf0i35x9ghpdp";
+      "i686-linux" = "15zaxgc1yc9ixbsgy2d8g8d7x2w4vbnndi1ms3wf0ss8azmghiag";
+      "x86_64-darwin" = "1818ahalahcbh974ai09hyfsns6njkpph4sbn4xwv2235x35dqib";
     }."${stdenv.system}";
   };
 
-  srcs = [ src prebuiltSrc ];
+  unpackPhase = ''
+    mkdir ${prebuiltName}
+    tar --strip-components=1 -C ${prebuiltName} -xf ${prebuiltSrc}
+    tar xf ${src}
+  '';
 
   # crystal on Darwin needs libiconv to build
   libs = [
@@ -41,25 +45,17 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "${name}";
 
-  fixPrebuiltBinary = if stdenv.isDarwin then ''
-    wrapProgram ../${prebuiltName}/embedded/bin/crystal \
-        --suffix DYLD_LIBRARY_PATH : $libPath
-  ''
-  else ''
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      ../${prebuiltName}/embedded/bin/crystal
-    patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } \
-      ../${prebuiltName}/embedded/bin/crystal
-  '';
-
   preBuild = ''
     patchShebangs bin/crystal
     patchShebangs ../${prebuiltName}/bin/crystal
-    ${fixPrebuiltBinary}
     export PATH="$(pwd)/../${prebuiltName}/bin:$PATH"
   '';
 
-  makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" "release=1" "all" "doc" ];
+  makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}"
+                "FLAGS=--no-debug"
+                "release=1"
+                "all" "docs"
+              ];
 
   installPhase = ''
     install -Dm755 .build/crystal $out/bin/crystal
@@ -70,7 +66,7 @@ stdenv.mkDerivation rec {
     cp -r src/* $out/lib/crystal/
 
     install -dm755 $out/share/doc/crystal/api
-    cp -r doc/* $out/share/doc/crystal/api/
+    cp -r docs/* $out/share/doc/crystal/api/
     cp -r samples $out/share/doc/crystal/
 
     install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5442f5a5f6bd..9d1a140fa10f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5583,7 +5583,7 @@ with pkgs;
   });
 
   crystal = callPackage ../development/compilers/crystal {
-    llvm = llvm_4;
+    llvm = llvm_5;
   };
 
   devpi-client = callPackage ../development/tools/devpi-client {};

From 10e8ea14dbc6b0a5ea7ac800eb7751bc94b514ec Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Sun, 24 Dec 2017 12:17:17 +0800
Subject: [PATCH 074/122] shards: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index b7d75999fdf6..36d9ddfb8ea1 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "shards-${version}";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz";
-    sha256 = "31de819c66518479682ec781a39ef42c157a1a8e6e865544194534e2567cb110";
+    sha256 = "1qiv9zzpccf6i5r2qrzbl84wgvqapbs0csazayhcpzfjfhg6i8wp";
   };
 
   buildInputs = [ crystal libyaml which ];

From 4be298bf6d517a87ccafb15d8f3d9534a1c27868 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 23 Dec 2017 21:03:06 +0100
Subject: [PATCH 075/122] nixos/sway: Extend the descriptions and examples

This'll hopefully make it a bit easier to get started with Sway and make
some things about the module more obvious.
---
 nixos/modules/programs/sway.nix | 50 ++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 98257846d02f..d9503d6004ff 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -4,35 +4,42 @@ with lib;
 
 let
   cfg = config.programs.sway;
-  sway = pkgs.sway;
+  swayPackage = pkgs.sway;
 
   swayWrapped = pkgs.writeShellScriptBin "sway" ''
-    if [ "$1" != "" ]; then
-      sway-setcap "$@"
-      exit
+    if [[ "$#" -ge 1 ]]; then
+      exec sway-setcap "$@"
+    else
+      ${cfg.extraSessionCommands}
+      exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
     fi
-    ${cfg.extraSessionCommands}
-    exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
   '';
   swayJoined = pkgs.symlinkJoin {
-    name = "sway-wrapped";
-    paths = [ swayWrapped sway ];
+    name = "sway-joined";
+    paths = [ swayWrapped swayPackage ];
   };
-in
-{
+in {
   options.programs.sway = {
-    enable = mkEnableOption "sway";
+    enable = mkEnableOption ''
+      the tiling Wayland compositor Sway. After adding yourself to the "sway"
+      group you can manually launch Sway by executing "sway" from a terminal.
+      If you call "sway" with any parameters the extraSessionCommands won't be
+      executed and Sway won't be launched with dbus-launch'';
 
     extraSessionCommands = mkOption {
-      default     = "";
-      type        = types.lines;
+      type = types.lines;
+      default = "";
       example = ''
-        export XKB_DEFAULT_LAYOUT=us,de
-        export XKB_DEFAULT_VARIANT=,nodeadkeys
-        export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,
+        # Define a keymap (US QWERTY is the default)
+        export XKB_DEFAULT_LAYOUT=de,us
+        export XKB_DEFAULT_VARIANT=nodeadkeys
+        export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
+        # Change the Keyboard repeat delay and rate
+        export WLC_REPEAT_DELAY=660
+        export WLC_REPEAT_RATE=25
       '';
       description = ''
-        Shell commands executed just before sway is started.
+        Shell commands executed just before Sway is started.
       '';
     };
 
@@ -41,9 +48,12 @@ in
       default = with pkgs; [
         i3status xwayland rxvt_unicode dmenu
       ];
+      defaultText = literalExample ''
+        with pkgs; [ i3status xwayland rxvt_unicode dmenu ];
+      '';
       example = literalExample ''
         with pkgs; [
-          i3status xwayland rxvt_unicode dmenu
+          i3lock light termite
         ]
       '';
       description = ''
@@ -56,7 +66,7 @@ in
     environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
     security.wrappers.sway = {
       program = "sway-setcap";
-      source = "${sway}/bin/sway";
+      source = "${swayPackage}/bin/sway";
       capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip";
       owner = "root";
       group = "sway";
@@ -70,4 +80,6 @@ in
     fonts.enableDefaultFonts = mkDefault true;
     programs.dconf.enable = mkDefault true;
   };
+
+  meta.maintainers = with lib.maintainers; [ gnidorah primeos ];
 }

From 1e147fee02d9c6af2fb6b8123d00f70135306604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 19:31:32 -0200
Subject: [PATCH 076/122] enlightenment: fix XDG_MENU_PREFIX

---
 nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 8a523f0d8036..7f3dc0d7847b 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -47,7 +47,7 @@ in
         export GTK_DATA_PREFIX=${config.system.path}
         # find theme engines
         export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
-        export XDG_MENU_PREFIX=enlightenment
+        export XDG_MENU_PREFIX=e-
 
         export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}"
 

From 248e3983b0fe3f89493ffc62fd73c3cd56160dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 19:31:54 -0200
Subject: [PATCH 077/122] gnome3: fix XDG_MENU_PREFIX

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index d2c856fc9332..21d30df5b695 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -136,7 +136,7 @@ in {
           # find theme engines
           export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
 
-          export XDG_MENU_PREFIX=gnome
+          export XDG_MENU_PREFIX=gnome-
 
           ${concatMapStrings (p: ''
             if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then

From 6e0387a1e6425066ea2fd838e35ffc7325bc6729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 24 Dec 2017 19:32:08 -0200
Subject: [PATCH 078/122] mate: fix XDG_MENU_PREFIX

---
 nixos/modules/services/x11/desktop-managers/mate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index ab8a0a48b483..6ec56f2b1535 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -47,7 +47,7 @@ in
         # Find theme engines
         export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
 
-        export XDG_MENU_PREFIX=mate
+        export XDG_MENU_PREFIX=mate-
 
         # Find the mouse
         export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons

From 9c621d7773a033cbec03e58a4c793fcc6a422a17 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Tue, 26 Dec 2017 00:13:24 +1300
Subject: [PATCH 079/122] darktable: 2.2.5 -> 2.4.0

---
 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 8c1db9c039e7..5fd636ff7c59 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.5";
+  version = "2.4.0";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3";
+    sha256 = "0y0q7a7k09sbg05k5xl1lz8n2ak1v8yarfv222ksvmbrxs53hdwx";
   };
 
   buildInputs =
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.darktable.org;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu maintainers.rickynils maintainers.flosse ];
+    maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ];
   };
 }

From f1be2aea3501f7c0bcdbe3a72ebd7873111a4c5f Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Mon, 25 Dec 2017 14:43:58 +0200
Subject: [PATCH 080/122] oil: 0.1.0 -> 0.3.0

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

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index ec7dbbbf5ffc..ab475a63499c 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchurl, coreutils }:
 let
-  version = "0.1.0";
+  version = "0.3.0";
 in
 stdenv.mkDerivation {
   name = "oil-${version}";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "0cf7jwwgvcq7q6zq8g5pi464hnn83b2km0nv6711qgqbxmsw85nx";
+    sha256 = "0j4fyn6xjaf29xqyzm09ahazmq9v1hkxv4kps7n3lzdfr32a4kk9";
   };
 
   postPatch = ''

From e7910ab2cb26c9811122e14536a19430e70b7e7e Mon Sep 17 00:00:00 2001
From: Jesper Geertsen Jonsson <yesbox@users.noreply.github.com>
Date: Mon, 25 Dec 2017 13:53:56 +0100
Subject: [PATCH 081/122] rclone: 1.38 -> 1.39

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index ad51703bd6fe..71df7a0fb1e7 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.38";
+  version = "1.39";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "0f56qm4lz55anzqf6dmjfywmvqy10zi5cl69zz8lda8lmvrpjm1d";
+    sha256 = "1x9qxhqkbyd7kd52ai9p996ppslh73xarn5w4ljaa97wwm5vwwsg";
   };
 
   outputs = [ "bin" "out" "man" ];

From 31637d09413c871b030c021eecf3abcee7c8b160 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski.uu@gmail.com>
Date: Mon, 25 Dec 2017 05:21:54 -0800
Subject: [PATCH 082/122] nrsc5: init at 20171129 (#32926)

---
 pkgs/applications/misc/nrsc5/default.nix | 50 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/misc/nrsc5/default.nix

diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix
new file mode 100644
index 000000000000..f1211851b4c6
--- /dev/null
+++ b/pkgs/applications/misc/nrsc5/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub,
+  autoconf, automake, libtool, cmake,
+  rtl-sdr, libao, fftwFloat
+} :
+let
+  src_faad2 = fetchFromGitHub {
+    owner = "dsvensson";
+    repo = "faad2";
+    rev = "b7aa099fd3220b71180ed2b0bc19dc6209a1b418";
+    sha256 = "0pcw2x9rjgkf5g6irql1j4m5xjb4lxj6468z8v603921bnir71mf";
+  };
+
+in stdenv.mkDerivation {
+  name = "nrsc5-20171129";
+
+  src = fetchFromGitHub {
+    owner = "theori-io";
+    repo = "nrsc5";
+    rev = "f87beeed96f12ce6aa4789ac1d45761cec28d2db";
+    sha256 = "03d5k59125qrjsm1naj9pd0nfzwi008l9n30p9q4g5abgqi5nc8v";
+  };
+
+  postUnpack = ''
+    export srcRoot=`pwd`
+    export faadSrc="$srcRoot/faad2-prefix/src/faad2_external"
+    mkdir -p $faadSrc
+    cp -r ${src_faad2}/* $faadSrc
+    chmod -R u+w $faadSrc
+  '';
+
+  postPatch = ''
+    sed -i '/GIT_REPOSITORY/d' CMakeLists.txt
+    sed -i '/GIT_TAG/d' CMakeLists.txt
+    sed -i "s:set (FAAD2_PREFIX .*):set (FAAD2_PREFIX \"$srcRoot/faad2-prefix\"):" CMakeLists.txt
+  '';
+
+  nativeBuildInputs = [ cmake autoconf automake libtool ];
+  buildInputs = [ rtl-sdr libao fftwFloat ];
+
+  cmakeFlags = [ "-DUSE_COLOR=ON" "-DUSE_FAAD2=ON" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/theori-io/nrsc5;
+    description = "HD-Radio decoder for RTL-SDR";
+    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ markuskowa ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27808c11934f..7fb8b6cfdd96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1220,6 +1220,8 @@ with pkgs;
   mpdris2 = callPackage ../tools/audio/mpdris2 { };
 
   nfdump = callPackage ../tools/networking/nfdump { };
+  
+  nrsc5 = callPackage ../applications/misc/nrsc5 { };
 
   onboard = callPackage ../applications/misc/onboard { };
 

From 407198c1ccda110cca5d8dab2f153cfa3d7697c1 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 25 Dec 2017 22:34:57 +0800
Subject: [PATCH 083/122] syncthing: 0.14.41 -> 0.14.42

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index ffb6d789503b..953febf67a86 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.41";
+  version = "0.14.42";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "1hcy4rxdyvwrpm480j5a4injkkdaqkixmbdy9blkq5i2fwv377yn";
+    sha256 = "1n3favv94wj1fr7x9av523fgm12b0kjlrmifa25wg2p6z10vwbqf";
   };
 
   buildInputs = [ go removeReferencesTo ];

From 2dca67864dc6b0684680f1e012d681476a217002 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Mon, 25 Dec 2017 14:56:25 -0600
Subject: [PATCH 084/122] fish: 2.7.0 -> 2.7.1

Fixes paste bracketing issue with iTerm (macOS)
---
 pkgs/shells/fish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index ec99f2bbf8de..490832d31d8b 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -88,7 +88,7 @@ let
 
   fish = stdenv.mkDerivation rec {
     name = "fish-${version}";
-    version = "2.7.0";
+    version = "2.7.1";
 
     etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
 
@@ -96,7 +96,7 @@ let
       # There are differences between the release tarball and the tarball github packages from the tag
       # Hence we cannot use fetchFromGithub
       url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz";
-      sha256 = "1jvvm27hp46w0cia14lfz6161dkz8b935j1m7j38i7rgx75bfxis";
+      sha256 = "0nhc3yc5lnnan7zmxqqxm07rdpwjww5ijy45ll2njdc6fnfb2az4";
     };
 
     buildInputs = [ ncurses libiconv pcre2 ];

From 62cb37b8d0a0d58f7a87431275f7000834973735 Mon Sep 17 00:00:00 2001
From: Milan Svoboda <milan.svoboda@centrum.cz>
Date: Mon, 25 Dec 2017 21:53:58 +0100
Subject: [PATCH 085/122] kitty: 0.5.1 -> 0.6.0

---
 pkgs/applications/misc/kitty/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 0dbe029bd333..bd671a6c90de 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification }:
+{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext }:
 
 with python3Packages;
 buildPythonApplication rec {
-  version = "0.5.1";
+  version = "0.6.0";
   name = "kitty-${version}";
   format = "other";
 
@@ -10,10 +10,10 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "0zs5b1sxi2f1lgpjs1qvd15gz6m1wfpyqskyyr0vmm4ch3rgp5zz";
+    sha256 = "1p86gry91m4kicy79fc1qfr0hcsd5xnvxzmm4q956x883h6h766r";
   };
 
-  buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz ];
+  buildInputs = [ fontconfig glfw ncurses libunistring harfbuzz libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext ];
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -38,6 +38,7 @@ buildPythonApplication rec {
     homepage = https://github.com/kovidgoyal/kitty;
     description = "A modern, hackable, featureful, OpenGL based terminal emulator";
     license = licenses.gpl3;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ tex ];
   };
 }

From aaf62f7f6eb8c620cf538b40880e29a9695e33c5 Mon Sep 17 00:00:00 2001
From: Julien Langlois <yourstruly@julienlanglois.me>
Date: Mon, 25 Dec 2017 01:36:57 -0800
Subject: [PATCH 086/122] (haskell.packages.ghc802.ghc): (fix llvm dependency)

Fix incorrect LLVM dependency of GHC 8.0.x to be 3.7 instead of 3.5.
---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index f625ad5f656c..30ecbe92f16c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -5,7 +5,7 @@ with haskellLib;
 self: super: {
 
   # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_35;
+  llvmPackages = pkgs.llvmPackages_37;
 
   # Disable GHC 8.0.x core libraries.
   array = null;

From c4036762b25dde23a60800b3f1ab88eb4acf9787 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Dec 2017 17:01:10 +0100
Subject: [PATCH 087/122] gitlab: remove unnecessary assertion

It also gives less information than the error from the module system.
---
 nixos/modules/services/misc/gitlab.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 7b2b40e59232..0c5d51564a04 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -248,7 +248,6 @@ in {
 
       databasePassword = mkOption {
         type = types.str;
-        default = "";
         description = "Gitlab database user password.";
       };
 
@@ -440,12 +439,6 @@ in {
 
     environment.systemPackages = [ pkgs.git gitlab-rake cfg.packages.gitlab-shell ];
 
-    assertions = [
-      { assertion = cfg.databasePassword != "";
-        message = "databasePassword must be set";
-      }
-    ];
-
     # Redis is required for the sidekiq queue runner.
     services.redis.enable = mkDefault true;
     # We use postgres as the main data store.

From 8fb981fef6a27c30d0ab1a237735f85dbfb62b56 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Dec 2017 19:42:43 +0100
Subject: [PATCH 088/122] python.pkgs.bash_kernel: use TMPDIR as HOME

---
 pkgs/development/python-modules/bash_kernel/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix
index b7f508cdda25..99c3346a4fbe 100644
--- a/pkgs/development/python-modules/bash_kernel/default.nix
+++ b/pkgs/development/python-modules/bash_kernel/default.nix
@@ -7,6 +7,7 @@
 , python
 , pexpect
 }:
+
 buildPythonPackage rec {
   pname = "bash_kernel";
   version = "0.7.1";
@@ -28,11 +29,11 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ ipykernel pexpect ];
 
+  # no tests
   doCheck = false;
 
   preBuild = ''
-    mkdir tmp
-    export HOME=$PWD/tmp
+    export HOME=$TMPDIR
   '';
 
   postInstall = ''

From 1e974ff09237f2963cbbc311ff0acebeb9ac59fb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Dec 2017 19:43:22 +0100
Subject: [PATCH 089/122] python.pkgs.service_identity: add meta and run tests

---
 .../service_identity/default.nix              | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix
index d27c4fe2975c..779e974f15e3 100644
--- a/pkgs/development/python-modules/service_identity/default.nix
+++ b/pkgs/development/python-modules/service_identity/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , characteristic
 , pyasn1
 , pyasn1-modules
@@ -16,23 +16,23 @@ buildPythonPackage rec {
   name = "${pname}-${version}";
 
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab";
+  src = fetchFromGitHub {
+    owner = "pyca";
+    repo = pname;
+    rev = version;
+    sha256 = "1fn332fci776m5a7jx8c1jgbm27160ip5qvv8p01c242ag6by5g0";
   };
 
   propagatedBuildInputs = [
     characteristic pyasn1 pyasn1-modules pyopenssl idna attrs
   ];
 
-  checkInputs = [
-    pytest
-  ];
+  checkInputs = [ pytest ];
+  checkPhase = "py.test";
 
-  checkPhase = ''
-    py.test
-  '';
-
-  # Tests not included in archive
-  doCheck = false;
-}
\ No newline at end of file
+  meta = with lib; {
+    description = "Service identity verification for pyOpenSSL";
+    license = licenses.mit;
+    homepage = "https://service-identity.readthedocs.io";
+  };
+}

From d86128cdf7ef26d4795301ae504045573e830755 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Dec 2017 20:08:10 +0100
Subject: [PATCH 090/122] python.pkgs.cccolutils: run tests on python3

---
 pkgs/development/python-modules/cccolutils/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cccolutils/default.nix b/pkgs/development/python-modules/cccolutils/default.nix
index edf7f0596c5f..c5d643da79d5 100644
--- a/pkgs/development/python-modules/cccolutils/default.nix
+++ b/pkgs/development/python-modules/cccolutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, krb5Full, nose, GitPython, mock, git }:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, krb5Full, nose, GitPython, mock, git }:
 
 buildPythonPackage rec {
   pname = "CCColUtils";
@@ -9,9 +9,11 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "1gwcq4xan9as1j3q9k2zqrywxp46qx0ljwxbck9id2fvilds6ck3";
   };
+
   buildInputs = [ krb5Full ];
   propagatedBuildInputs = [ nose GitPython mock git ];
-  doCheck = false;
+
+  doCheck = isPy3k; # needs unpackaged module to run tests on python2
 
   meta = with stdenv.lib; {
     description = "Python Kerberos 5 Credential Cache Collection Utilities";

From ade98dc442ea78e9783d5e26954e64ec4a1b2c94 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Dec 2017 20:23:10 +0100
Subject: [PATCH 091/122] python.pkgs.semver: run tests

---
 pkgs/development/python-modules/semver/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index 9a309d1e3b94..21aa41d80053 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "semver";
   version = "2.7.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1ffb55fb86a076cf7c161e6b5931f7da59f15abe217e0f24cea96cc8eec50f42";
+  src = fetchFromGitHub {
+    owner = "k-bx";
+    repo = "python-semver";
+    rev = "2001c62d1a0361c44acc7076d8ce91e1d1c66141"; # not tagged in repository
+    sha256 = "01c05sv97dyr672sa0nr3fnh2aqbmvkfw19d6rkaj16h2sdsyg0i";
   };
 
-  # No tests in archive
-  doCheck = false;
+  checkInputs = [ pytest ];
+  checkPhase = "pytest -v tests.py";
 
   meta = with stdenv.lib; {
     description = "Python package to work with Semantic Versioning (http://semver.org/)";

From 32feb1ee1dee1b2696a4cc6817863d91f18867f4 Mon Sep 17 00:00:00 2001
From: Sam Parkinson <sam@sam.today>
Date: Tue, 26 Dec 2017 13:47:24 +1100
Subject: [PATCH 092/122] youtube-dl: 2017.12.02 -> 2017.12.23

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index fa4b7db57567..d8af8169a188 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.12.02";
+  version = "2017.12.23";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1qf5gz00cnxzab3cwh9kxzhs08mddm0nwvb7j5z5xxzhi6wkslha";
+    sha256 = "12m1bjdqm9bsc1f5psnzc203avzwr070xpdr6fqr728am536q845";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From cf52f8e7e5d318a0a75200c7ad00cd733a91c83f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 26 Dec 2017 11:18:10 +0800
Subject: [PATCH 093/122] qsynth: 0.4.4 -> 0.5.0

---
 pkgs/applications/audio/qsynth/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 3435e3ed1630..71f41f87009e 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -2,22 +2,30 @@
 
 stdenv.mkDerivation  rec {
   name = "qsynth-${version}";
-  version = "0.4.4";
+  version = "0.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/qsynth/${name}.tar.gz";
-    sha256 = "0qhfnikx3xcllkvs60kj6vcf2rwwzh31y41qkk6kwfhzgd219y8f";
+    sha256 = "1sr6vrz8z9r99j9xcix86lgcqldragb2ajmq1bnhr58d99sda584";
   };
 
+  # cmake is looking for qsynth.desktop.in and fails if it doesn't find it
+  # seems like a bug and can presumable go in the next version after 0.5.0
+  postPatch = ''
+    mv src/qsynth.desktop src/qsynth.desktop.in
+  '';
+
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Fluidsynth GUI";
     homepage = https://sourceforge.net/projects/qsynth;
     license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ goibhniu ];
     platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
   };
 }

From 644e39abf19e3b79bfca91694f9eca54c22642f7 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 26 Dec 2017 12:18:33 +0800
Subject: [PATCH 094/122] miraclecast: 20151002 -> 20170427

---
 .../os-specific/linux/miraclecast/default.nix | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix
index 0d79027d8b79..c7990466ca73 100644
--- a/pkgs/os-specific/linux/miraclecast/default.nix
+++ b/pkgs/os-specific/linux/miraclecast/default.nix
@@ -1,27 +1,33 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, systemd, glib, readline }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+, glib, readline, pcre, systemd, udev }:
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "miraclecast-0.0-git-20151002";
+  name = "miraclecast-${version}";
+  version = "1.0-20170427";
 
   src = fetchFromGitHub {
-    owner = "albfan";
-    repo = "miraclecast";
-    rev = "30b8c2d22391423f76ba582aaaa1e0936869103a";
-    sha256 = "0i076n76kq64fayc7v06gr1853pk5r6ms86m57vd1xsjd0r9wyxd";
+    owner  = "albfan";
+    repo   = "miraclecast";
+    rev    = "a395c3c7afc39a958ae8ab805dea0f5d22118f0c";
+    sha256 = "03kbjajv2x0i2g68c5aij0icf9waxnqkc9pp32z60nc8zxy9jk1y";
   };
 
-  # INFO: It is important to list 'systemd' first as for now miraclecast
-  # links against a customized systemd. Otherwise, a systemd package from
-  # a propagatedBuildInput could take precedence.
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ systemd udev glib readline ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
 
-  meta = {
-    homepage = https://github.com/albfan/miraclecast;
+  buildInputs = [ glib pcre readline systemd udev ];
+
+  enableParallelBuilding = true;
+
+  mesonFlags = [
+    "-Drely-udev=true"
+    "-Dbuild-tests=true"
+  ];
+
+  meta = with stdenv.lib; {
     description = "Connect external monitors via Wi-Fi";
-    license = licenses.lgpl21Plus;
+    homepage    = https://github.com/albfan/miraclecast;
+    license     = licenses.lgpl21Plus;
     maintainers = with maintainers; [ tstrobel ];
-    platforms = platforms.linux;
+    platforms   = platforms.linux;
   };
 }

From e98e7fb329c73b8f15ead5f49cd222bc1f86d292 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Dec 2017 13:32:18 +0100
Subject: [PATCH 095/122] haskell: drop obsolete GHC version 7.10.2; we have
 7.10.3

---
 pkgs/development/compilers/ghc/7.10.2.nix | 88 -----------------------
 pkgs/top-level/haskell-packages.nix       |  8 ---
 2 files changed, 96 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/7.10.2.nix

diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
deleted file mode 100644
index 51274dd60598..000000000000
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils
-, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
-
-  # If enabled GHC will be build with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-, enableIntegerSimple ? false, gmp
-}:
-
-let
-  inherit (bootPkgs) ghc;
-
-  buildMK = ''
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
-    ${stdenv.lib.optionalString stdenv.isDarwin ''
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
-      libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
-    ''}
-  '' + (if enableIntegerSimple then ''
-    INTEGER_LIBRARY=integer-simple
-  '' else ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
-  '');
-
-in
-
-stdenv.mkDerivation rec {
-  version = "7.10.2";
-  name = "ghc-${version}";
-
-  src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz";
-    sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
-  };
-
-  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
-
-  patches = [ ./relocation.patch ];
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "doc" ];
-
-  preConfigure = ''
-    echo >mk/build.mk "${buildMK}"
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '';
-
-  configureFlags = [
-    "--with-gcc=${stdenv.cc}/bin/cc"
-    "--datadir=$doc/share/doc/ghc"
-  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ];
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
-
-  postInstall = ''
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs;
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 661c6d8bf76d..b36f2431b48a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -58,10 +58,6 @@ in rec {
     ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix {
       ghc = compiler.ghc742Binary;
     };
-    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix rec {
-      bootPkgs = packages.ghc784;
-      inherit (bootPkgs) hscolour;
-    };
     ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec {
       bootPkgs = packages.ghc784;
       inherit (bootPkgs) hscolour;
@@ -150,10 +146,6 @@ in rec {
       ghc = compiler.ghc784;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
     };
-    ghc7102 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc7102;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
-    };
     ghc7103 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc7103;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };

From eb0da3e8afebd017e8d93afabd213e095674cceb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Dec 2017 13:35:07 +0100
Subject: [PATCH 096/122] haskell: drop package sets for GHC 6.12.x, 7.0.x,
 7.2.x, 7.4.x, and 7.6.x

These old package sets have been broken and unmaintained for a long time now.
---
 .../configuration-ghc-6.12.x.nix              |  94 -------------
 .../configuration-ghc-7.0.x.nix               |  85 ------------
 .../configuration-ghc-7.2.x.nix               |  89 -------------
 .../configuration-ghc-7.4.x.nix               | 117 -----------------
 .../configuration-ghc-7.6.x.nix               | 124 ------------------
 pkgs/top-level/haskell-packages.nix           |  26 ----
 6 files changed, 535 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
 delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
 delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
 delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
 delete mode 100644 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
deleted file mode 100644
index 47c8e7fa69ec..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # LLVM is not supported on this GHC; use the latest one.
-  inherit (pkgs) llvmPackages;
-
-  # Disable GHC 6.12.x core libraries.
-  array = null;
-  base = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  directory = null;
-  dph-base = null;
-  dph-par = null;
-  dph-prim-interface = null;
-  dph-prim-par = null;
-  dph-prim-seq = null;
-  dph-seq = null;
-  extensible-exceptions = null;
-  ffi = null;
-  filepath = null;
-  ghc-binary = null;
-  ghc-prim = null;
-  haskell98 = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  random = null;
-  rts = null;
-  syb = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_5_1;
-  deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_3_1;
-  hoopl = self.hoopl_3_10_2_0;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # We have no working cabal-install at the moment.
-  cabal-install = markBroken super.cabal-install;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_7; };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # https://github.com/glguy/utf8-string/issues/9
-  utf8-string = overrideCabal super.utf8-string (drv: {
-    configureFlags = drv.configureFlags or [] ++ ["-f-bytestring-in-base" "--ghc-option=-XUndecidableInstances"];
-    preConfigure = "sed -i -e 's|base >= .* < .*,|base,|' utf8-string.cabal";
-  });
-
-  # https://github.com/haskell/HTTP/issues/80
-  HTTP = doJailbreak super.HTTP;
-
-  # 6.12.3 doesn't support the latest version.
-  primitive = self.primitive_0_5_1_0;
-  parallel = self.parallel_3_2_0_3;
-  vector = self.vector_0_10_9_3;
-
-  # These packages need more recent versions of core libraries to compile.
-  happy = addBuildTools super.happy [self.Cabal_1_18_1_7 self.containers_0_4_2_1];
-  network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_7;
-  stm = addBuildTool super.stm self.Cabal_1_18_1_7;
-  split = super.split_0_1_4_3;
-
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
-  # Needs void on pre 7.10.x compilers.
-  conduit = addBuildDepend super.conduit self.void;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
deleted file mode 100644
index 6bb96704cc20..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_34;
-
-  # Disable GHC 7.0.x core libraries.
-  array = null;
-  base = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  directory = null;
-  extensible-exceptions = null;
-  ffi = null;
-  filepath = null;
-  ghc-binary = null;
-  ghc-prim = null;
-  haskell2010 = null;
-  haskell98 = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  random = null;
-  rts = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_7_6_1;
-  deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_3_1;
-  hoopl = self.hoopl_3_10_2_0;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
-  };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # https://github.com/haskell/containers/issues/134
-  containers_0_4_2_1 = doJailbreak super.containers_0_4_2_1;
-
-  # These packages need more recent versions of core libraries to compile.
-  happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1];
-
-  # Setup: Can't find transitive deps for haddock
-  doctest = dontHaddock super.doctest;
-  hsdns = dontHaddock super.hsdns;
-
-  # Newer versions require bytestring >=0.10.
-  tar = super.tar_0_4_1_0;
-
-  # These builds need additional dependencies on old compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-  conduit = addBuildDepend super.conduit self.void;
-  reflection = addBuildDepend super.reflection self.tagged;
-  semigroups = addBuildDepend super.semigroups self.nats;
-  text = addBuildDepend super.text self.bytestring-builder;
-
-  # Newer versions don't compile any longer.
-  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
-  network = self.network_2_6_3_1;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
deleted file mode 100644
index de47086409be..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_34;
-
-  # Disable GHC 7.2.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  directory = null;
-  extensible-exceptions = null;
-  ffi = null;
-  filepath = null;
-  ghc-prim = null;
-  haskell2010 = null;
-  haskell98 = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_3_1;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_5_1; process = self.process_1_2_3_0; };
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
-  };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # The old containers version won't compile against newer versions of deepseq.
-  containers_0_4_2_1 = super.containers_0_4_2_1.override { deepseq = self.deepseq_1_3_0_1; };
-
-  # These packages need more recent versions of core libraries to compile.
-  happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1];
-
-  # Setup: Can't find transitive deps for haddock
-  doctest = dontHaddock super.doctest;
-  hsdns = dontHaddock super.hsdns;
-
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
-  # Newer versions require bytestring >=0.10.
-  tar = super.tar_0_4_1_0;
-
-  # These builds need additional dependencies on old compilers.
-  conduit = addBuildDepend super.conduit self.void;
-  reflection = addBuildDepend super.reflection self.tagged;
-  semigroups = addBuildDepend super.semigroups self.nats;
-  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
-  text = addBuildDepend super.text self.bytestring-builder;
-
-  # Newer versions don't compile any longer.
-  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
-  network = self.network_2_6_3_1;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
deleted file mode 100644
index 73bc28b4dd34..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_34;
-
-  # Disable GHC 7.4.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  deepseq = null;
-  directory = null;
-  extensible-exceptions = null;
-  filepath = null;
-  ghc-prim = null;
-  haskell2010 = null;
-  haskell98 = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  haskeline = self.haskeline_0_7_3_1;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; };
-
-  # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; });
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # https://github.com/haskell/primitive/issues/16
-  primitive = dontCheck super.primitive;
-
-  # https://github.com/tibbe/unordered-containers/issues/96
-  unordered-containers = dontCheck super.unordered-containers;
-
-  # The test suite depends on time >=1.4.0.2.
-  cookie = dontCheck super.cookie ;
-
-  # Work around bytestring >=0.10.2.0 requirement.
-  streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder;
-
-  # Choose appropriate flags for our version of 'bytestring'.
-  bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";
-
-  # Newer versions require a more recent compiler.
-  control-monad-free = super.control-monad-free_0_5_3;
-
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
-  # Test suite won't compile.
-  unix-time = dontCheck super.unix-time;
-
-  # The test suite depends on mockery, which pulls in logging-facade, which
-  # doesn't compile with this older version of base:
-  # https://github.com/sol/logging-facade/issues/14
-  doctest = dontCheck super.doctest;
-
-  # Avoid depending on tasty-golden.
-  monad-par = dontCheck super.monad-par;
-
-  # Newer versions require bytestring >=0.10.
-  tar = super.tar_0_4_1_0;
-
-  # Needs void on pre 7.10.x compilers.
-  conduit = addBuildDepend super.conduit self.void;
-
-  # Needs tagged on pre 7.6.x compilers.
-  reflection = addBuildDepend super.reflection self.tagged;
-
-  # These builds need additional dependencies on old compilers.
-  semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]);
-  QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
-  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
-  text = addBuildDepend super.text self.bytestring-builder;
-  vector = addBuildDepend super.vector self.semigroups;
-
-  # Newer versions don't compile any longer.
-  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
-  network = self.network_2_6_3_1;
-
-  # Haddock fails with an internal error.
-  utf8-string = dontHaddock super.utf8-string;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
deleted file mode 100644
index 43a1b1b70bd1..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
-  # Suitable LLVM version.
-  llvmPackages = pkgs.llvmPackages_34;
-
-  # Disable GHC 7.6.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bin-package-db = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  deepseq = null;
-  directory = null;
-  filepath = null;
-  ghc-prim = null;
-  haskell2010 = null;
-  haskell98 = null;
-  hoopl = null;
-  hpc = null;
-  integer-gmp = null;
-  old-locale = null;
-  old-time = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  template-haskell = null;
-  time = null;
-  unix = null;
-
-  # These packages are core libraries in GHC 7.10.x, but not here.
-  haskeline = self.haskeline_0_7_3_1;
-  terminfo = self.terminfo_0_4_0_2;
-  transformers = self.transformers_0_4_3_0;
-  xhtml = self.xhtml_3000_2_1;
-
-  # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; });
-
-  # Requires ghc 8.2
-  ghc-proofs = dontDistribute super.ghc-proofs;
-
-  # https://github.com/tibbe/hashable/issues/85
-  hashable = dontCheck super.hashable;
-
-  # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
-
-  # Haddock chokes on the prologue from the cabal file.
-  ChasingBottoms = dontHaddock super.ChasingBottoms;
-
-  # Later versions require a newer version of bytestring than we have.
-  aeson = self.aeson_0_7_0_6;
-
-  # The test suite depends on time >=1.4.0.2.
-  cookie = dontCheck super.cookie;
-
-  # Work around bytestring >=0.10.2.0 requirement.
-  streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder;
-
-  # Choose appropriate flags for our version of 'bytestring'.
-  bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";
-
-  # Tagged is not part of base in this environment.
-  contravariant = addBuildDepend super.contravariant self.tagged;
-  reflection = dontHaddock (addBuildDepend super.reflection self.tagged);
-
-  # The compat library is empty in the presence of mtl 2.2.x.
-  mtl-compat = dontHaddock super.mtl-compat;
-
-  # Newer versions require a more recent compiler.
-  control-monad-free = super.control-monad-free_0_5_3;
-
-  # Needs hashable on pre 7.10.x compilers.
-  nats_1 = addBuildDepend super.nats_1 self.hashable;
-  nats = addBuildDepend super.nats self.hashable;
-
-  # https://github.com/magthe/sandi/issues/7
-  sandi = overrideCabal super.sandi (drv: {
-    postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal";
-  });
-
-  # These packages require additional build inputs on older compilers.
-  blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder;
-  text = addBuildDepend super.text self.bytestring-builder;
-
-  # available convertible package won't build with the available
-  # bytestring and ghc-mod won't build without convertible
-  convertible = markBroken super.convertible;
-  ghc-mod = markBroken super.ghc-mod;
-
-  # Needs void on pre 7.10.x compilers.
-  conduit = addBuildDepend super.conduit self.void;
-
-  # Needs additional inputs on old compilers.
-  semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]);
-  lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
-  distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;
-  QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
-  void = addBuildDepends super.void (with self; [hashable semigroups]);
-  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
-  vector = addBuildDepend super.vector self.semigroups;
-
-  # Need a newer version of Cabal to interpret their build instructions.
-  cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0;
-  extra = addSetupDepend super.extra self.Cabal_1_24_2_0;
-  hlint = addSetupDepend super.hlint self.Cabal_1_24_2_0;
-
-  # Haddock doesn't cope with the new markup.
-  bifunctors = dontHaddock super.bifunctors;
-
-  # Breaks a dependency cycle between QuickCheck and semigroups
-  unordered-containers = dontCheck super.unordered-containers;
-
-  # The test suite requires Cabal 1.24.x or later to compile.
-  comonad = dontCheck super.comonad;
-  semigroupoids = dontCheck super.semigroupoids;
-
-}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b36f2431b48a..0d620ce2b295 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -116,32 +116,6 @@ in rec {
 
   packages = {
 
-    # Support for this compiler is broken, because it can't deal with directory-based package databases.
-    # ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; };
-    ghc6123 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc6123;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { };
-    };
-    ghc704 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc704;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { };
-    };
-    ghc722 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc722;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { };
-    };
-    ghc742 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc742;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { };
-    };
-    ghc763 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc763;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { };
-    };
-    ghc783 = callPackage ../development/haskell-modules {
-      ghc = compiler.ghc783;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };
-    };
     ghc784 = callPackage ../development/haskell-modules {
       ghc = compiler.ghc784;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { };

From 052fdc94276507cb4247fc8c1a8257f990851afc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 21 Dec 2017 02:30:34 +0100
Subject: [PATCH 097/122] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.7-5-g07d8814 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/72f75113ede74a720c73526754eeb8b0dc4f5f9a.
---
 .../haskell-modules/hackage-packages.nix      | 1621 ++++++++++++++---
 1 file changed, 1398 insertions(+), 223 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c5bb3145fa45..60dc80a159b0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -8461,13 +8461,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "HSlippyMap";
-       version = "2.2";
-       sha256 = "17n1kpva97lwhwg2vs7875bfqlwcq6xpl2agqc53qb7j4153p559";
-       revision = "2";
-       editedCabalFile = "0iw3s7snb255jxj555vyfl3ckgqxf6xivbzl4z9ypy18a5glpzri";
+       version = "2.5";
+       sha256 = "10n69p8ka1ri54in7yh1gjwh7fcw8nx4rvfhs9gcxmvawj96fyab";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/41px/HSlippyMap";
-       description = "OpenStreetMap (OSM) Slippy Map";
+       homepage = "https://github.com/apeyroux/HSlippyMap";
+       description = "OpenStreetMap Slippy Map";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -13692,6 +13690,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mesa;};
 
+  "OpenGLRaw_3_2_7_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "3.2.7.0";
+       sha256 = "024aln102d1mmsdalq9jd5mmwjbnrb8gxcak73lybrc7q87kswk2";
+       libraryHaskellDepends = [
+         base bytestring containers fixed half text transformers
+       ];
+       librarySystemDepends = [ mesa ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mesa;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -15574,7 +15590,7 @@ self: {
        sha256 = "139lggc8f7sw703asdyxqbja0jfcgphx0l5si1046lsryinvywa9";
        libraryHaskellDepends = [ base containers text time ];
        testHaskellDepends = [
-         base containers hspec QuickCheck text time
+         base containers hspec QuickCheck scalendar text time
        ];
        homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System";
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
@@ -21630,6 +21646,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-generic-compat_0_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base }:
+     mkDerivation {
+       pname = "aeson-generic-compat";
+       version = "0.0.1.1";
+       sha256 = "1davhg48x4k9nsizpafjlicwryi05ijfh902bn35x76pay7alims";
+       libraryHaskellDepends = [ aeson base ];
+       description = "Compatible generic class names of Aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-injector" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, deepseq
      , hashable, HUnit, lens, QuickCheck, quickcheck-text, scientific
@@ -22018,18 +22046,18 @@ self: {
      }) {};
 
   "affection" = callPackage
-    ({ mkDerivation, babl, base, clock, containers, gegl, glib
-     , monad-loops, monad-parallel, mtl, sdl2, text
+    ({ mkDerivation, base, bytestring, clock, containers, glib, linear
+     , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid
      }:
      mkDerivation {
        pname = "affection";
-       version = "0.0.0.6";
-       sha256 = "0fc071zl68acm01ik4v1admy0hs4jp787kpadw9ddavwykmr6jdz";
+       version = "0.0.0.7";
+       sha256 = "0qnlh1ny4cysxzh45vsh1d49gk4kc2kzpdjrqnn3mh66wz2fc177";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         babl base clock containers gegl glib monad-loops monad-parallel mtl
-         sdl2 text
+         base bytestring clock containers glib linear monad-loops
+         monad-parallel mtl OpenGL sdl2 stm text uuid
        ];
        homepage = "https://github.com/nek0/affection#readme";
        description = "A simple Game Engine using SDL";
@@ -22821,8 +22849,8 @@ self: {
      }:
      mkDerivation {
        pname = "algebra";
-       version = "4.3";
-       sha256 = "1h61lvy9fkkzm2gpr78b09bid0yi1fd7xa4mx90jy2sd16gq6k1r";
+       version = "4.3.1";
+       sha256 = "090jaipyx5pcav2wqcqzds51fwx49l4c9cpp9nnk16bgkf92z615";
        libraryHaskellDepends = [
          adjunctions array base containers distributive mtl nats
          semigroupoids semigroups tagged transformers void
@@ -23354,6 +23382,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alternators_0_1_2_0" = callPackage
+    ({ mkDerivation, base, mmorph, transformers }:
+     mkDerivation {
+       pname = "alternators";
+       version = "0.1.2.0";
+       sha256 = "19i2yhi6nsd2nl7sisbj6wrii5nw1z7xj7zk0fjmivyclnj03r5g";
+       libraryHaskellDepends = [ base mmorph transformers ];
+       homepage = "https://github.com/louispan/alternators#readme";
+       description = "Handy functions when using transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "altfloat" = callPackage
     ({ mkDerivation, base, ghc-prim, integer-gmp }:
      mkDerivation {
@@ -26046,6 +26087,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-terminal_0_8" = callPackage
+    ({ mkDerivation, base, colour }:
+     mkDerivation {
+       pname = "ansi-terminal";
+       version = "0.8";
+       sha256 = "1gg2xy800vzj2xixx8ifis1z027v34xj1a3792v0y8b7kmypgwlb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base colour ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/feuerbach/ansi-terminal";
+       description = "Simple ANSI terminal support, with Windows compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ansi-wl-pprint" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -29022,28 +29079,32 @@ self: {
 
   "ats-format" = callPackage
     ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base
-     , bytestring, Cabal, composition-prelude, criterion, deepseq
-     , directory, file-embed, happy, hspec, htoml-megaparsec, lens
-     , megaparsec, optparse-applicative, process, recursion-schemes
-     , text, unordered-containers
+     , Cabal, composition-prelude, criterion, deepseq, directory
+     , dirstream, file-embed, filepath, happy, hspec, hspec-core
+     , htoml-megaparsec, lens, megaparsec, optparse-applicative, pipes
+     , pipes-safe, process, recursion-schemes, system-filepath, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ats-format";
-       version = "0.1.0.3";
-       sha256 = "0pisqcx11n2xrdr5xq1y08fbx0hhnvhqngf2bh1wqpfr1ad4vj76";
+       version = "0.1.0.6";
+       sha256 = "04r12ssp9ih4rrynlab2swn7krklzrb5m1xz0xh99adhfvap4fmf";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal directory lens process ];
        libraryHaskellDepends = [
-         ansi-terminal ansi-wl-pprint array base bytestring
-         composition-prelude deepseq directory file-embed htoml-megaparsec
-         lens megaparsec optparse-applicative process recursion-schemes text
+         ansi-terminal ansi-wl-pprint array base composition-prelude deepseq
+         directory file-embed htoml-megaparsec lens megaparsec
+         optparse-applicative process recursion-schemes text
          unordered-containers
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec ];
+       testHaskellDepends = [
+         base dirstream filepath hspec hspec-core pipes pipes-safe
+         system-filepath
+       ];
        benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://hub.darcs.net/vmchale/ats-format#readme";
        description = "A source-code formatter for ATS";
@@ -29707,6 +29768,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter_1_1_3" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "1.1.3";
+       sha256 = "0rkgb2vfznn6a28h40c26if43mzcavwd81myi27zbg8811g9bv6m";
+       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
@@ -35013,6 +35090,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bittrex" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client-tls, lens
+     , lens-aeson, scientific, SHA, split, text, time, wreq
+     }:
+     mkDerivation {
+       pname = "bittrex";
+       version = "0.3.0.0";
+       sha256 = "00h2lrs2a65f2fc4wkmlil3hqwlnayxxvb7nq2gcmkcpgsf9sc1k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client-tls lens lens-aeson scientific
+         SHA split text time wreq
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/dmjio/bittrex";
+       description = "API bindings to bittrex.com";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bitvec" = callPackage
     ({ mkDerivation, base, HUnit, primitive, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, vector
@@ -35072,6 +35169,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bitx-bitcoin_0_12_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, directory
+     , doctest, exceptions, hspec, http-client, http-client-tls
+     , http-types, microlens, microlens-th, network, QuickCheck, safe
+     , scientific, split, text, time
+     }:
+     mkDerivation {
+       pname = "bitx-bitcoin";
+       version = "0.12.0.0";
+       sha256 = "0wf86pkpm5vlcv5cci2sn6by0ajmq44b3azxc41zivqdpf5kkwii";
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq exceptions http-client
+         http-client-tls http-types microlens microlens-th network
+         QuickCheck scientific split text time
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory doctest hspec http-client
+         http-types microlens safe text time
+       ];
+       homepage = "https://github.com/tebello-thejane/bitx.hs";
+       description = "A Haskell library for working with the BitX bitcoin exchange";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bizzlelude" = callPackage
     ({ mkDerivation, base, containers, directory, text }:
      mkDerivation {
@@ -38725,19 +38847,21 @@ self: {
      }) {};
 
   "cabal-bounds" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-lenses, cmdargs, directory
-     , either, filepath, Glob, lens, process, strict, tasty
-     , tasty-golden, transformers, unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-lenses
+     , cmdargs, directory, either, filepath, Glob, lens, lens-aeson
+     , process, strict, tasty, tasty-golden, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "1.2.0";
-       sha256 = "1lbkfz5sw292br1zcki2r3qpzc1q5hk3h40xkbbhflqmw3m1h0fj";
+       version = "1.3.0";
+       sha256 = "0cv4j4x5zwnddi6nsnl78i1b1pisg6fwpdpy2iv8ndyw3h2msmys";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal cabal-lenses cmdargs directory either filepath lens
-         strict transformers unordered-containers
+         aeson base bytestring Cabal cabal-lenses cmdargs directory either
+         filepath lens lens-aeson strict text transformers
+         unordered-containers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -38755,8 +38879,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.8.1";
-       sha256 = "0xzzxzh41k8h6sf04b6j49b44c68gvghh0slifywj171ip4zv5g3";
+       version = "0.9.0";
+       sha256 = "0w371991841m4d9r73nr86j4jnr0jilj9jnvkmgh9a055vyi573s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39138,8 +39262,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.4.9";
-       sha256 = "0f4250cssh42xvrr6npnv71303pxkhv3k26bh6j2ifwz489nmfsr";
+       version = "0.6.0";
+       sha256 = "0wj6plxg19mfaycw6glrn7b5g2rsvvflkar63qn01c86vzkj7ynd";
        libraryHaskellDepends = [
          base Cabal either lens strict system-fileio system-filepath text
          transformers unordered-containers
@@ -39472,6 +39596,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-toolkit_0_0_4" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers, ghc
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "cabal-toolkit";
+       version = "0.0.4";
+       sha256 = "04afwsbbqsw9lj7flbnrfwy3qbv1c9nkwm65ylspy2nzf9v06ljj";
+       libraryHaskellDepends = [
+         base binary bytestring Cabal containers ghc template-haskell
+       ];
+       homepage = "https://github.com/TerrorJack/cabal-toolkit#readme";
+       description = "Helper functions for writing custom Setup.hs scripts.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-uninstall" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process }:
      mkDerivation {
@@ -41755,8 +41896,8 @@ self: {
      }:
      mkDerivation {
        pname = "celtchar";
-       version = "0.1.2.0";
-       sha256 = "1p53fyv15vvch6zjv2mgycj9wpcxkxpfbwkmbi7dpjgi65wyaz97";
+       version = "0.1.3.0";
+       sha256 = "1f67vi6kjjhnnr4kxnzgkva1qvcadx9968cmac3iix2g56xs26wn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45504,8 +45645,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, file-embed, text }:
      mkDerivation {
        pname = "cndict";
-       version = "0.9.0";
-       sha256 = "0v0drr7zxh2ndq91vhpsi4ykna993fnkfmxana7g1q4c2vn8b5sc";
+       version = "0.10.0";
+       sha256 = "12vybpji4bxwn8in18xqp4l2js1cbnn8fgk3r6m5c8idp769ph2m";
        libraryHaskellDepends = [ array base bytestring file-embed text ];
        homepage = "https://github.com/Lemmih/cndict";
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
@@ -45974,8 +46115,8 @@ self: {
      }:
      mkDerivation {
        pname = "collection-json";
-       version = "1.1.0.2";
-       sha256 = "033hwm20w1432nh3gvphkkyl9i4rjm74l3szplpsq0a9rp097la0";
+       version = "1.1.1.0";
+       sha256 = "1fvgwshw4622p7j2fnvpxq3bj3pgcshrbrik74a3sdgdj01kpl6c";
        libraryHaskellDepends = [
          aeson base network-uri network-uri-json text
        ];
@@ -47241,8 +47382,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "0.1.1.1";
-       sha256 = "124r75vmbjd6nvibj3yadwnrkhr1r2d6i30qx3acidljw0fjfcnm";
+       version = "0.1.1.2";
+       sha256 = "1ii230d9v7mcpsax9x001ai0nw6pm50zsgyaw9d1s9s2pvf927wr";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/composition-prelude#readme";
        description = "Higher-order function combinators";
@@ -47678,6 +47819,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "concurrency_1_3_0_0" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, exceptions
+     , monad-control, mtl, stm, transformers
+     }:
+     mkDerivation {
+       pname = "concurrency";
+       version = "1.3.0.0";
+       sha256 = "1z75m5wgvdp4lx6v18ap60pdqgdhf1132qlamm07m4dlpkd5il98";
+       libraryHaskellDepends = [
+         array atomic-primops base exceptions monad-control mtl stm
+         transformers
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Typeclasses, functions, and data types for concurrency and STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-barrier" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -48196,6 +48355,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-extra_1_2_3" = callPackage
+    ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
+     , bytestring-builder, conduit, criterion, directory, exceptions
+     , filepath, hspec, monad-control, network, primitive, process
+     , QuickCheck, resourcet, stm, streaming-commons, text, transformers
+     , transformers-base, typed-process, unliftio-core
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.2.3";
+       sha256 = "1ca18kjfcbbcd345rxhpvdhnc0gma6408vpl0hasspb6k7yjsabk";
+       libraryHaskellDepends = [
+         async attoparsec base blaze-builder bytestring conduit directory
+         exceptions filepath monad-control network primitive process
+         resourcet stm streaming-commons text transformers transformers-base
+         typed-process unliftio-core
+       ];
+       testHaskellDepends = [
+         async attoparsec base blaze-builder bytestring bytestring-builder
+         conduit directory exceptions hspec process QuickCheck resourcet stm
+         streaming-commons text transformers transformers-base
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder conduit criterion
+         transformers
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Batteries included conduit: adapters for common libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-find" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -48344,6 +48535,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conduit-throttle_0_3_1_0" = callPackage
+    ({ mkDerivation, async, base, conduit, conduit-combinators
+     , conduit-extra, HUnit, monad-control, resourcet, stm, stm-chans
+     , stm-conduit, test-framework, test-framework-hunit
+     , throttle-io-stream, unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "conduit-throttle";
+       version = "0.3.1.0";
+       sha256 = "0ad3balm1r5jm4jvf26pr1kaiqnzvjznjh5kidk2bknxylbddmld";
+       libraryHaskellDepends = [
+         async base conduit conduit-combinators conduit-extra monad-control
+         resourcet stm stm-chans throttle-io-stream unliftio unliftio-core
+       ];
+       testHaskellDepends = [
+         async base conduit conduit-combinators conduit-extra HUnit
+         monad-control resourcet stm stm-chans stm-conduit test-framework
+         test-framework-hunit throttle-io-stream unliftio unliftio-core
+       ];
+       homepage = "https://github.com/mtesseract/conduit-throttle#readme";
+       description = "Throttle Conduit Producers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-tokenize-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit, hspec
      , resourcet, text
@@ -54321,6 +54537,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-diverse_2_0_1_0" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
+     , hspec, tagged
+     }:
+     mkDerivation {
+       pname = "data-diverse";
+       version = "2.0.1.0";
+       sha256 = "0997mn0amfl4k70rvrxjw24dzyr6sv42nr1d24whyy114lsiv05b";
+       libraryHaskellDepends = [
+         base containers deepseq ghc-prim tagged
+       ];
+       testHaskellDepends = [ base hspec tagged ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/louispan/data-diverse#readme";
+       description = "Extensible records and polymorphic variants";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-diverse-lens" = callPackage
     ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
      , profunctors, tagged
@@ -54340,6 +54575,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-diverse-lens_2_1_0_0" = callPackage
+    ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
+     , profunctors, tagged
+     }:
+     mkDerivation {
+       pname = "data-diverse-lens";
+       version = "2.1.0.0";
+       sha256 = "1i71f67agjaflb1cz8v6qpfy1qfwwmw8fjq8zl6kqd28z4k0mms7";
+       libraryHaskellDepends = [
+         base data-diverse generic-lens lens profunctors tagged
+       ];
+       testHaskellDepends = [
+         base data-diverse generic-lens hspec lens tagged
+       ];
+       homepage = "https://github.com/louispan/data-diverse-lens#readme";
+       description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-dword" = callPackage
     ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty
      , tasty-quickcheck, template-haskell
@@ -55487,19 +55742,28 @@ self: {
 
   "datadog" = callPackage
     ({ mkDerivation, aeson, auto-update, base, buffer-builder
-     , bytestring, lens, lifted-base, monad-control, network, old-locale
-     , text, time, transformers-base
+     , bytestring, Cabal, dlist, exceptions, hspec, http-client
+     , http-client-tls, http-types, lens, lifted-base, monad-control
+     , network, old-locale, random, text, time, transformers-base
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "datadog";
-       version = "0.1.0.1";
-       sha256 = "05hfpkaizbgqi998wa0l0hb8qph8y7gwyx05690ljr0883m5a663";
+       version = "0.2.0.0";
+       sha256 = "0zk4dkd6q2rv0fbylp2fprizahfx2imczhrj08n0qd5h3mnck3c9";
        libraryHaskellDepends = [
-         aeson auto-update base buffer-builder bytestring lens lifted-base
-         monad-control network old-locale text time transformers-base
+         aeson auto-update base buffer-builder bytestring dlist http-client
+         http-client-tls http-types lens lifted-base monad-control network
+         old-locale text time transformers-base unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson auto-update base buffer-builder bytestring Cabal dlist
+         exceptions hspec http-client http-client-tls http-types lens
+         lifted-base monad-control network old-locale random text time
+         transformers-base unordered-containers vector
        ];
        homepage = "https://github.com/iand675/datadog";
-       description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming.";
+       description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -57060,6 +57324,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_1_0_0_0" = callPackage
+    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
+     , leancheck, profunctors, random, ref-fd, transformers
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "1.0.0.0";
+       sha256 = "0d7darip6dkvpn9gqvr8lkid0b19a5sxd31f5rn8b5fpgc368i8v";
+       libraryHaskellDepends = [
+         base concurrency containers deepseq exceptions leancheck
+         profunctors random ref-fd transformers
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "A library for unit-testing concurrent programs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -57664,8 +57946,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "derulo";
-       version = "0.0.3";
-       sha256 = "19g7nrgd5z7larkw1nb4vm9hfid1j8s2pcqyqflff4mp764m2ipg";
+       version = "0.0.4";
+       sha256 = "0xdz9hfh9wyh5pyn82kapbjiq6hgrdr23krb2940q0hr0rf39ssb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -58360,6 +58642,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-lib_1_4_2" = callPackage
+    ({ mkDerivation, active, adjunctions, array, base, bytestring
+     , cereal, colour, containers, criterion, data-default-class
+     , deepseq, diagrams-core, diagrams-solve, directory, distributive
+     , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable
+     , intervals, JuicyPixels, lens, linear, monoid-extras, mtl
+     , numeric-extras, optparse-applicative, process, profunctors
+     , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-lib";
+       version = "1.4.2";
+       sha256 = "1rdg8b46hc1ybk1y9dw7w725rag58rkr7hs7z3gvk4isxm11gm79";
+       libraryHaskellDepends = [
+         active adjunctions array base bytestring cereal colour containers
+         data-default-class diagrams-core diagrams-solve directory
+         distributive dual-tree exceptions filepath fingertree fsnotify
+         hashable intervals JuicyPixels lens linear monoid-extras mtl
+         optparse-applicative process profunctors semigroups tagged text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base deepseq diagrams-solve distributive lens numeric-extras tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion diagrams-core ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Embedded domain-specific language for declarative graphics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-pandoc" = callPackage
     ({ mkDerivation, base, diagrams-builder, diagrams-cairo
      , diagrams-lib, directory, filepath, linear, optparse-applicative
@@ -61543,6 +61858,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dotenv_0_5_2_0" = callPackage
+    ({ mkDerivation, base, base-compat, directory, exceptions, hspec
+     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
+     , transformers, yaml
+     }:
+     mkDerivation {
+       pname = "dotenv";
+       version = "0.5.2.0";
+       sha256 = "1w3jq6jr5n53rwgjcwmbhhba3nfc073sc9ff6f8672jwsscvlnc1";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base base-compat directory exceptions megaparsec process text
+         transformers yaml
+       ];
+       executableHaskellDepends = [
+         base base-compat megaparsec optparse-applicative process text
+         transformers yaml
+       ];
+       testHaskellDepends = [
+         base base-compat directory exceptions hspec hspec-megaparsec
+         megaparsec process text transformers yaml
+       ];
+       homepage = "https://github.com/stackbuilders/dotenv-hs";
+       description = "Loads environment variables from dotenv files";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dotfs" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src, HFuse, HUnit, parsec, process, QuickCheck
@@ -62076,6 +62421,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "drifter-postgresql_0_2_1" = callPackage
+    ({ mkDerivation, base, containers, drifter, either, mtl
+     , postgresql-simple, tasty, tasty-hunit, text, time, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "drifter-postgresql";
+       version = "0.2.1";
+       sha256 = "0p7ddvfmjhf22psga0phhw2m0sdhymsc5k13jrwrdawsxivh2clk";
+       libraryHaskellDepends = [
+         base containers drifter mtl postgresql-simple time transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base drifter either postgresql-simple tasty tasty-hunit text
+       ];
+       homepage = "http://github.com/michaelxavier/drifter-postgresql";
+       description = "PostgreSQL support for the drifter schema migration tool";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "drinkery" = callPackage
     ({ mkDerivation, base, criterion, mtl, transformers }:
      mkDerivation {
@@ -64150,16 +64517,17 @@ self: {
      }) {};
 
   "ekg-elasticsearch" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname
-     , http-client, lens, text, time, unordered-containers, wreq
+    ({ mkDerivation, aeson, base, bytestring, data-default-class
+     , ekg-core, hostname, http-client, lens, req, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ekg-elasticsearch";
-       version = "0.3.1.1";
-       sha256 = "0v78xrmnxx6z0lgx8lvc15hmd0zgm2kqibvkf9sj3cdza75vsr1q";
+       version = "0.4.0.0";
+       sha256 = "03bh278n6xvvjr9z8lws25nf1x0j5rw12zmd7h55vmfjn0iblajy";
        libraryHaskellDepends = [
-         aeson base bytestring ekg-core hostname http-client lens text time
-         unordered-containers wreq
+         aeson base bytestring data-default-class ekg-core hostname
+         http-client lens req text time unordered-containers
        ];
        homepage = "https://github.com/cdodev/ekg-elasticsearch";
        description = "Push metrics to elasticsearch";
@@ -65757,8 +66125,8 @@ self: {
      }:
      mkDerivation {
        pname = "epub-tools";
-       version = "2.9";
-       sha256 = "198fzgd04j1dyiv9cpkg6aqvawfiqb4k5awyqbiw6ll84sy0ymgb";
+       version = "2.10";
+       sha256 = "0bahnq1fs31j5bmfm5pi9cn72c64bv5ib29w5qw1lqhp10zr3j17";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -65768,7 +66136,7 @@ self: {
        testHaskellDepends = [
          base directory epub-metadata filepath HUnit mtl parsec regex-compat
        ];
-       homepage = "http://hub.darcs.net/dino/epub-tools";
+       homepage = "https://github.com/dino-/epub-tools.git";
        description = "Command line utilities for working with epub files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66443,8 +66811,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer";
-       version = "3.2.0";
-       sha256 = "1rqzx2b6fn8vzls05g7hs163h5fjw2cdhkyqbfr8a7p9cyv32nk8";
+       version = "3.3.4";
+       sha256 = "0d9xw77i8dzb4sk3j7qhnbdand58vz1bhfvqb0qhvg0qdfg732vi";
        libraryHaskellDepends = [
          aeson base bimap bytestring containers ethereum-analyzer-deps extra
          fgl GenericPretty graphviz hexstring hoopl pretty protolude split
@@ -66469,8 +66837,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-cli";
-       version = "3.2.0";
-       sha256 = "1svyxmk4441x95xxfqn3z18dqvkqykyksqiyb4298pb8g0cq54sx";
+       version = "3.3.4";
+       sha256 = "1bpr5l8hsn6ggiqs3b4mw27r52ikpqibdhn4w22k1gk8mdfr9gzc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66496,8 +66864,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-deps";
-       version = "3.2.0";
-       sha256 = "1ahpk43ihr3ddzzpxi6vx27f77i84grny5avsakjn0hlzz3ady19";
+       version = "3.3.4";
+       sha256 = "00v0f797z99yil4ihgirsyw9l4yiscg3aidlwjq4maixvzsqvr02";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base16-bytestring binary bytestring
          containers deepseq fast-logger global-lock monad-logger split text
@@ -66516,8 +66884,8 @@ self: {
      }:
      mkDerivation {
        pname = "ethereum-analyzer-webui";
-       version = "3.2.0";
-       sha256 = "17hmsmr13qvmfl9w9yfmxbbi6lv3b3r3kqsgnbji5i01jvgnggvs";
+       version = "3.3.4";
+       sha256 = "11h5q6xmig8fk3bxk797s231pk5dnsvvxs9r68zbxv7jk466yq97";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66664,6 +67032,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "euler-tour-tree" = callPackage
+    ({ mkDerivation, base, containers, fingertree, hlint, keys, mtl
+     , parser-combinators, QuickCheck, sequence, tasty, tasty-hunit
+     , tasty-quickcheck, transformers, Unique
+     }:
+     mkDerivation {
+       pname = "euler-tour-tree";
+       version = "0.1.0.0";
+       sha256 = "0fyz5dyqcgbzpizdpkfd5ndbgpd059cv9f1z84zr5l8wv967c1xf";
+       libraryHaskellDepends = [
+         base containers fingertree mtl parser-combinators transformers
+         Unique
+       ];
+       testHaskellDepends = [
+         base containers hlint keys QuickCheck sequence tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/k0ral/euler-tour-tree";
+       description = "Euler tour trees";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "euphoria" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, elerea
      , enummapset-th, hashable, HUnit, test-framework
@@ -67042,15 +67432,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "eventsource-geteventstore-store_1_0_5" = callPackage
+  "eventsource-geteventstore-store_1_0_6" = callPackage
     ({ mkDerivation, aeson, base, eventsource-api
      , eventsource-store-specs, eventstore, mtl, protolude
      , string-conversions, tasty, tasty-hspec, transformers-base
      }:
      mkDerivation {
        pname = "eventsource-geteventstore-store";
-       version = "1.0.5";
-       sha256 = "0lbgjbl14p6480pmr27zls91g0zy8g0id59ls0hajaghwibcabb6";
+       version = "1.0.6";
+       sha256 = "0fy1sgc43a6d4hrwyc3kawcnvpm4zlmwnznw27zd40hrbzkkkzw2";
        libraryHaskellDepends = [
          aeson base eventsource-api eventstore mtl string-conversions
          transformers-base
@@ -68216,6 +68606,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "extensible-effects_2_2_1_0" = callPackage
+    ({ mkDerivation, base, criterion, directory, HUnit, mtl, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, transformers, transformers-base, type-aligned
+     }:
+     mkDerivation {
+       pname = "extensible-effects";
+       version = "2.2.1.0";
+       sha256 = "1x21y5ilv5hka4cx7il53gr89hpap577pacfg8v23zbravi270zr";
+       libraryHaskellDepends = [
+         base transformers transformers-base type-aligned
+       ];
+       testHaskellDepends = [
+         base directory HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th
+       ];
+       benchmarkHaskellDepends = [ base criterion mtl ];
+       homepage = "https://github.com/suhailshergill/extensible-effects";
+       description = "An Alternative to Monad Transformers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-exceptions" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -71738,6 +72151,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow_1_0_10" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.10";
+       sha256 = "1k8p475m1485nq4236jf53gmls264c5dy8x57zihb7gbvgnl71fj";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       homepage = "https://github.com/tfausak/flow#readme";
+       description = "Write more understandable Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flow-er" = callPackage
     ({ mkDerivation, base, doctest, flow, QuickCheck }:
      mkDerivation {
@@ -71917,8 +72344,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.4.1";
-       sha256 = "0yclwq488g9mz6wsjcch7c5kwgc97rxp0lqjlfj44vbqbjk72l5x";
+       version = "0.5.4.2";
+       sha256 = "1zhrc5b0czz69lh2dm5z4kxrf2clm3j4xbljf0chg9xkvid063x9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -72878,6 +73305,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "formatting_6_3_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
+     , integer-gmp, old-locale, scientific, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "formatting";
+       version = "6.3.0";
+       sha256 = "16xngayk1jd92bj2qaf7fmrgzdskdnc7rsgpk1ij06xd8cdgahf1";
+       libraryHaskellDepends = [
+         array base bytestring clock ghc-prim integer-gmp old-locale
+         scientific text time transformers
+       ];
+       testHaskellDepends = [ base hspec ];
+       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "forml" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cereal
      , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger
@@ -73968,8 +74413,8 @@ self: {
      }:
      mkDerivation {
        pname = "friday-juicypixels";
-       version = "0.1.2.2";
-       sha256 = "1sci0whrkjlm731z1qk7p7sg7vaw61brcb167w9f6fbkagn2f67l";
+       version = "0.1.2.3";
+       sha256 = "19j321vqca8sl366j3acdskr8zhzcki429zxzs8xawdmxqh93vzv";
        libraryHaskellDepends = [ base friday JuicyPixels vector ];
        testHaskellDepends = [
          base bytestring file-embed friday hspec JuicyPixels
@@ -74022,6 +74467,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "frisby_0_2_2" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, semigroups }:
+     mkDerivation {
+       pname = "frisby";
+       version = "0.2.2";
+       sha256 = "1mdncc38qwakadr8q4ncz9vzvx9scfhlgk2m540y2mjdypdiicy1";
+       libraryHaskellDepends = [ array base containers mtl semigroups ];
+       homepage = "http://repetae.net/computer/frisby/";
+       description = "Linear time composable parser for PEG grammars";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "from-sum" = callPackage
     ({ mkDerivation, base, doctest, Glob, mtl }:
      mkDerivation {
@@ -77673,8 +78131,8 @@ self: {
     ({ mkDerivation, base, cpphs, ghc, happy }:
      mkDerivation {
        pname = "ghc-parser";
-       version = "0.2.0.0";
-       sha256 = "0jd02qgjs529ac0jvg59rgrjvpm541j993lyfpqr9aqwqj1n3ylp";
+       version = "0.2.0.1";
+       sha256 = "10xx2d9awgizjz1jrlw2m30nsl938mh297azp7zay7zkdzsv0fyh";
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
        homepage = "https://github.com/gibiansky/IHaskell";
@@ -77731,12 +78189,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-prim_0_5_1_0" = callPackage
+  "ghc-prim_0_5_1_1" = callPackage
     ({ mkDerivation, rts }:
      mkDerivation {
        pname = "ghc-prim";
-       version = "0.5.1.0";
-       sha256 = "13ypjfpz5b4zpbr2q8x37nbqjd0224l9g8xn62iv7mbqbgynkbf9";
+       version = "0.5.1.1";
+       sha256 = "1dkl0l891min86jpndcah8dx7i3ssnaj6yf2ghxplp8619bmqhb2";
        libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -77846,10 +78304,8 @@ self: {
     ({ mkDerivation, array, base, containers, ghc, hpc }:
      mkDerivation {
        pname = "ghc-srcspan-plugin";
-       version = "0.2.2.0";
-       sha256 = "1wdgc1m914iy4876cf8qwxad0q2abqvs10f6dj0dnfs6sgqyqdz1";
-       revision = "1";
-       editedCabalFile = "1h821qji9xgf9d4sd040fw10v1312dxzin556ppc67wxbx5mjc9i";
+       version = "0.2.2.1";
+       sha256 = "10zh7i4nx4ds3f1d7m2m1caqnxmi3dh6a900fl8mcp6a09isvglh";
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
@@ -79979,6 +80435,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-release_1_1_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.1.2";
+       sha256 = "0czc53xwg21jvd7g4ggjva0nzc2rpyf36rc4876dss9lckcc2p93";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -88172,8 +88650,8 @@ self: {
     ({ mkDerivation, base, hakyll, ogmarkup }:
      mkDerivation {
        pname = "hakyll-ogmarkup";
-       version = "3.0";
-       sha256 = "088hcjy34xxyaphy8c7kj82w88pwzdaww1xww791hjrq0r75icf7";
+       version = "4.0";
+       sha256 = "1w8wmqdfxf9w4mb9k77gak9iqxysa7mbb5phfh9a0hy30vx2qb1d";
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme";
        description = "Integrate ogmarkup document with Hakyll";
@@ -92277,8 +92755,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-updater";
-       version = "1.3";
-       sha256 = "1q9rjy36wqagy665k0ifnfwr9r1fy2if5gnva9q069hdir15lkzm";
+       version = "1.3.1";
+       sha256 = "0q2aix579mm3ksi0hipcmw8g2p5xfbgk6ph7jnraq5i2rxjchg7v";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -93520,6 +93998,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hasmin_1_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring
+     , containers, criterion, directory, doctest, doctest-discover
+     , gitrev, hopfli, hspec, hspec-attoparsec, matrix, mtl, numbers
+     , optparse-applicative, parsers, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasmin";
+       version = "1.0.1";
+       sha256 = "1h5ygl9qmzmbhqfb58hhm2zw850dqfkp4b8cp3bhsnangg4lgbjk";
+       revision = "1";
+       editedCabalFile = "18qpp71nkf0sayzwxwfn2nz1g8fklsa55h2jrazqilhrdq82gq7d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bifunctors containers matrix mtl numbers parsers
+         text
+       ];
+       executableHaskellDepends = [
+         base bytestring gitrev hopfli optparse-applicative text
+       ];
+       testHaskellDepends = [
+         attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
+         QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion directory text ];
+       homepage = "https://github.com/contivero/hasmin#readme";
+       description = "CSS Minifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasparql-client" = callPackage
     ({ mkDerivation, base, HTTP, monads-fd, network, xml }:
      mkDerivation {
@@ -96313,6 +96823,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "here_1_2_12" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, mtl, parsec
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "here";
+       version = "1.2.12";
+       sha256 = "0kiwcknk145z7y48qgpf73f0kwz4nnqa72q14vypy21sb5bpcgxc";
+       libraryHaskellDepends = [
+         base haskell-src-meta mtl parsec template-haskell
+       ];
+       homepage = "https://github.com/tmhedberg/here";
+       description = "Here docs & interpolated strings via quasiquotation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heredoc" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -99165,8 +99692,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.11";
-       sha256 = "1y5f7xdw1rriz2d7qxnkywyjsa09bk6712rks3l1zkihi5i3fnr7";
+       version = "0.2.0.12";
+       sha256 = "074yqf8xsa1crfjxf2inn37bn0qm0dbxl0mlnxxlx4cqyjyqsz7h";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -99185,10 +99712,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.2.6";
-       sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36";
-       revision = "8";
-       editedCabalFile = "0fjlyb3pbn5dfkns8hlb696aawmw6gkm1ad2la0aiy2kyzhvl838";
+       version = "1.3.0";
+       sha256 = "0kr0s2zdi1453cfbwm5i99ajybk72q012k9bd13lwc22fksph9xq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108554,6 +109079,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hunit-dejafu_1_0_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
+     mkDerivation {
+       pname = "hunit-dejafu";
+       version = "1.0.0.0";
+       sha256 = "1xsfv8pdkmyplggzk0k17j1y10kbjrvb86izsnc9k2w0lmd1j6ji";
+       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the HUnit test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -111375,8 +111913,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.9.0.1";
-       sha256 = "1xfp0pzxsfcz8h4f27fqvbc6pprwz45cgq5sa393z3wqy17ni4lq";
+       version = "0.9.0.2";
+       sha256 = "0pa366b4vn5hc9ymd4g1pr4dsffvk80x9c8yq4d1pf4jngjfayql";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -111407,8 +111945,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-aeson";
-       version = "0.3.0.0";
-       sha256 = "0h2bbkqwl8mdyn24n0lphcjfrvmfq8ckincv3rncspp9h0v705m7";
+       version = "0.3.0.1";
+       sha256 = "1ds13a2j2bdr86gcb6vr8dfsb9fjia670lzwwqk4hsvyjgsbd2d7";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring here ihaskell text
        ];
@@ -111435,8 +111973,8 @@ self: {
     ({ mkDerivation, base, blaze-html, blaze-markup, ihaskell }:
      mkDerivation {
        pname = "ihaskell-blaze";
-       version = "0.3.0.0";
-       sha256 = "1il3iz1nksh5v753srvchrjdazf7dqsd3q59w7crzbyrlx81v97b";
+       version = "0.3.0.1";
+       sha256 = "1733lg13v3pn95249gxbxrvbwfg2a95badvf98vkx6hx2mbxv9q7";
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
@@ -111450,8 +111988,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-charts";
-       version = "0.3.0.0";
-       sha256 = "0nlimyx953v1s4xgzdb9987i9bw1bdralkg2x6cp41kzqd49i4f3";
+       version = "0.3.0.1";
+       sha256 = "1m7jxl1pxl0hcfa24xgjcwj4k50an8phm2lkpr4493yr1x2isk35";
        libraryHaskellDepends = [
          base bytestring Chart Chart-cairo data-default-class directory
          ihaskell
@@ -111468,8 +112006,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-diagrams";
-       version = "0.3.1.0";
-       sha256 = "18q7m6xrshn1ixn0j75bdvpgvjq63sic3dfjzcz9zk73zmvpj4qz";
+       version = "0.3.1.1";
+       sha256 = "1c6a469ymfcjmf4larh1sh6qzaxgq260r55vzx78irh036k5h0lc";
        libraryHaskellDepends = [
          active base bytestring diagrams diagrams-cairo diagrams-lib
          directory ihaskell text
@@ -111493,12 +112031,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ihaskell-gnuplot" = callPackage
+    ({ mkDerivation, base, bytestring, gnuplot, ihaskell }:
+     mkDerivation {
+       pname = "ihaskell-gnuplot";
+       version = "0.1.0.1";
+       sha256 = "1qdcx0y52w805z5dg2xwsy1ykbbk05i4k04y0w3r4r3wwjvq3kk6";
+       libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
+       homepage = "http://www.github.com/gibiansky/ihaskell";
+       description = "IHaskell display instance for Gnuplot (from gnuplot package)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ihaskell-hatex" = callPackage
     ({ mkDerivation, base, HaTeX, ihaskell, text }:
      mkDerivation {
        pname = "ihaskell-hatex";
-       version = "0.2.1.0";
-       sha256 = "098mbabwsl5i5dnvdy732ivrpzyb5njpr4483zss22axdni9p68i";
+       version = "0.2.1.1";
+       sha256 = "0rsfavpxm14bbrjcsi9rps3p1bjhhgvam0znhn8vwfmic3fpsda8";
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for hatex";
@@ -111530,8 +112080,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-juicypixels";
-       version = "0.3.0.0";
-       sha256 = "0apsll540z4hzzs39bqk14iadnr4rjp873q712la7lp2xnyf4k0y";
+       version = "1.1.0.1";
+       sha256 = "1fjngq27572rlri9m6674ddbgqh5ygl5dagma3z50m1l8n0g7z6s";
        libraryHaskellDepends = [
          base bytestring directory ihaskell JuicyPixels
        ];
@@ -111547,8 +112097,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-magic";
-       version = "0.3.0.0";
-       sha256 = "05jvyca163daqrmpb7fhk1wng04vk4bayffp0lp68sy3zskrjndl";
+       version = "0.3.0.1";
+       sha256 = "02zqlvnl73qkbx1yx7fc9dwcg3k7fk9jr9iqn22l38wsk01nm7c2";
        libraryHaskellDepends = [
          base base64-bytestring bytestring ihaskell ipython-kernel magic
          text utf8-string
@@ -111577,12 +112127,12 @@ self: {
      }) {};
 
   "ihaskell-plot" = callPackage
-    ({ mkDerivation, base, bytestring, ihaskell, plot }:
+    ({ mkDerivation, base, bytestring, hmatrix, ihaskell, plot }:
      mkDerivation {
        pname = "ihaskell-plot";
-       version = "0.3.0.0";
-       sha256 = "17qp2ln9v4sv9i3biyxgyq0csqikxwm5gs612fn5zsl1ixznj1h1";
-       libraryHaskellDepends = [ base bytestring ihaskell plot ];
+       version = "0.3.0.1";
+       sha256 = "12bi8im5489kmy0d26kn3hljkj4c1xynsa97h6nh5dp53awklm3y";
+       libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
@@ -111614,8 +112164,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-widgets";
-       version = "0.2.3.1";
-       sha256 = "0ay3wpv8ayyxvky3cpyzmwpbgkxc76avr119nb632a7nig74rzvp";
+       version = "0.2.3.2";
+       sha256 = "18kp3s534k241ld1s0ds5hln47pc863dfs3i6r9w67adnf6qhff8";
        libraryHaskellDepends = [
          aeson base containers ihaskell ipython-kernel scientific singletons
          text unix unordered-containers vector vinyl
@@ -112100,6 +112650,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "importify_1_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, autoexporter, base
+     , bytestring, Cabal, containers, filepath, fmt, foldl, hashable
+     , haskell-names, haskell-src-exts, hse-cpp, hspec, log-warper
+     , microlens-platform, optparse-applicative, path, path-io
+     , pretty-simple, syb, template-haskell, text, text-format, turtle
+     , universum, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "importify";
+       version = "1.0.1";
+       sha256 = "1snm75p3p3nvjclqis6qglb17gr0pm2dw0i980jpzrqm3n3kciy3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty autoexporter base bytestring Cabal containers
+         filepath fmt foldl hashable haskell-names haskell-src-exts hse-cpp
+         log-warper microlens-platform path path-io pretty-simple syb
+         template-haskell text text-format turtle universum
+         unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         base log-warper optparse-applicative path path-io text universum
+       ];
+       testHaskellDepends = [
+         base filepath hspec log-warper microlens-platform path path-io
+         universum unordered-containers
+       ];
+       homepage = "https://github.com/serokell/importify";
+       description = "Tool for haskell imports refactoring";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "imports" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl }:
      mkDerivation {
@@ -114444,6 +115028,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ipython-kernel_0_9_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, containers
+     , directory, filepath, mtl, parsec, process, SHA, temporary, text
+     , transformers, unordered-containers, uuid, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "ipython-kernel";
+       version = "0.9.0.1";
+       sha256 = "0nzl5zcl03cdp0l6idscp648n64qjnhvfyj2j47fiiy1fkz133s7";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cereal containers directory filepath mtl
+         process SHA temporary text transformers unordered-containers uuid
+         zeromq4-haskell
+       ];
+       executableHaskellDepends = [
+         base filepath mtl parsec text transformers
+       ];
+       homepage = "http://github.com/gibiansky/IHaskell";
+       description = "A library for creating kernels for IPython frontends";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -116892,8 +117502,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-feed";
-       version = "0.0.2";
-       sha256 = "0ka8g2d3hn8z122k8r7gxs8m72s4ys46j6s2yc2ys045r1fhzlc1";
+       version = "0.0.6";
+       sha256 = "1mmxwhdrvxx5y0s8d7lxggjd396g3ga69zj6c2s020kdakhplnam";
        libraryHaskellDepends = [
          aeson base bytestring mime-types network-uri tagsoup text time
        ];
@@ -117585,8 +118195,8 @@ self: {
      }:
      mkDerivation {
        pname = "judy";
-       version = "0.3.0";
-       sha256 = "17fblav2npg47kn2dq82lcpf299igd91pi0ynffklf5hr8dw70zl";
+       version = "0.4.0";
+       sha256 = "115991jvp9gg9iy3n8p8y0y39x236v17g5xqchmlfsja1nx9hbzc";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        librarySystemDepends = [ Judy ];
        testHaskellDepends = [ base hspec QuickCheck ];
@@ -119805,6 +120415,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lackey_0_4_7" = callPackage
+    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
+     mkDerivation {
+       pname = "lackey";
+       version = "0.4.7";
+       sha256 = "026w7wmz71g9796mx6mdn3s1nxrds631kacn423zdvchridm0398";
+       libraryHaskellDepends = [ base servant servant-foreign text ];
+       testHaskellDepends = [ base hspec servant servant-foreign text ];
+       homepage = "https://github.com/tfausak/lackey#readme";
+       description = "Generate Ruby clients from Servant APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lagrangian" = callPackage
     ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -121457,7 +122081,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -126918,6 +127542,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "log-warper_1_8_3" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, async, base, containers
+     , data-default, deepseq, directory, filepath, fmt, hspec, HUnit
+     , markdown-unlit, microlens-mtl, microlens-platform, mmorph
+     , monad-control, monad-loops, mtl, QuickCheck, text, time
+     , transformers, transformers-base, universum, unix
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "log-warper";
+       version = "1.8.3";
+       sha256 = "1awblvxh6cncwlqacxb1wq4s77x79ncrz6dl81wgrbjjifwpf0xz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base containers deepseq directory filepath fmt
+         microlens-platform mmorph monad-control monad-loops mtl text time
+         transformers transformers-base universum unix unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base markdown-unlit mtl text universum yaml
+       ];
+       testHaskellDepends = [
+         async base data-default directory filepath hspec HUnit
+         microlens-mtl QuickCheck universum unordered-containers
+       ];
+       homepage = "https://github.com/serokell/log-warper";
+       description = "Flexible, configurable, monadic and pretty logging";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log2json" = callPackage
     ({ mkDerivation, base, containers, json, parsec }:
      mkDerivation {
@@ -128417,6 +129074,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lxd-client_0_1_0_5" = callPackage
+    ({ mkDerivation, aeson, async, base, bimap, bytestring, connection
+     , containers, data-default, directory, either, exceptions, filepath
+     , hspec, hspec-core, http-api-data, http-client, http-client-tls
+     , http-media, http-types, mtl, network, random, semigroups, servant
+     , servant-client, text, tls, transformers, turtle, unix, uuid
+     , websockets, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "lxd-client";
+       version = "0.1.0.5";
+       sha256 = "1981q1b71xgmxlis2hydhzhcwcspyrwnllg3fdrajv7m9z1zlryc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bimap bytestring connection containers
+         data-default directory either exceptions filepath http-api-data
+         http-client http-client-tls http-media http-types mtl network
+         semigroups servant servant-client text tls transformers unix
+         websockets x509 x509-store x509-validation
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base exceptions hspec hspec-core random text turtle uuid
+       ];
+       homepage = "https://github.com/hverr/haskell-lxd-client#readme";
+       description = "LXD client written in Haskell";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lxd-client-config" = callPackage
     ({ mkDerivation, aeson, base, containers, directory, filepath
      , HUnit, QuickCheck, test-framework, test-framework-hunit
@@ -131903,6 +132591,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memory_0_14_11" = callPackage
+    ({ mkDerivation, base, basement, bytestring, deepseq, foundation
+     , ghc-prim, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "memory";
+       version = "0.14.11";
+       sha256 = "0k6x58r3if8zbsgip8nr7lb77xf468qxlwqnmah8p313rxfg0k37";
+       libraryHaskellDepends = [
+         base basement bytestring deepseq foundation ghc-prim
+       ];
+       testHaskellDepends = [
+         base foundation tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/vincenthz/hs-memory";
+       description = "memory and related abstraction stuff";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "memorypool" = callPackage
     ({ mkDerivation, base, containers, transformers, unsafe, vector }:
      mkDerivation {
@@ -133757,24 +134465,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mmark_0_0_3_1" = callPackage
+  "mmark_0_0_3_2" = callPackage
     ({ mkDerivation, aeson, base, case-insensitive, containers
-     , criterion, data-default-class, deepseq, email-validate, foldl
-     , hashable, hspec, hspec-megaparsec, html-entity-map, lucid
+     , criterion, data-default-class, deepseq, dlist, email-validate
+     , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
      , megaparsec, microlens, microlens-th, modern-uri, mtl
      , parser-combinators, QuickCheck, text, text-metrics
      , unordered-containers, weigh, yaml
      }:
      mkDerivation {
        pname = "mmark";
-       version = "0.0.3.1";
-       sha256 = "0q6abmml27qww95hzpck4mjshaxhz3pmpzgxdbg8bnaaa6prv0jp";
+       version = "0.0.3.2";
+       sha256 = "0z3dgdq0x4brr56gcrjwssbxlwpaycrz1f5cxdnh2nzpz2dw9s2i";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
-         email-validate foldl hashable html-entity-map lucid megaparsec
-         microlens microlens-th modern-uri mtl parser-combinators text
-         text-metrics unordered-containers yaml
+         dlist email-validate foldl hashable html-entity-map lucid
+         megaparsec microlens microlens-th modern-uri mtl parser-combinators
+         text text-metrics unordered-containers yaml
        ];
        testHaskellDepends = [
          aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
@@ -136187,6 +136895,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "more-containers" = callPackage
+    ({ mkDerivation, base, containers, hspec }:
+     mkDerivation {
+       pname = "more-containers";
+       version = "0.1.0.1";
+       sha256 = "0iqs86py0mz9dsjfrvzf97hg4xsxl0sbqvc8bvfvyglxrxqj53jb";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers hspec ];
+       homepage = "https://github.com/mtth/more-containers#readme";
+       description = "A few more collections";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "more-extensible-effects" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -136407,8 +137128,8 @@ self: {
      }:
      mkDerivation {
        pname = "movie-monad";
-       version = "0.0.2.0";
-       sha256 = "0cf4hrakz6cw1c3izrrckhjjhn8hd8cn9gfh41v2xi8kcn6bbciw";
+       version = "0.0.3.0";
+       sha256 = "1dwkf378bq0xkf60h3gxaq431m4gxr6wk17549yc6bbc4zx2q7vq";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -138803,6 +139524,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nakadi-client_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
+     , classy-prelude, conduit, conduit-combinators, conduit-extra
+     , containers, hashable, http-client, http-client-tls, http-conduit
+     , http-types, iso8601-time, lens, lens-aeson, monad-logger, mtl
+     , random, resourcet, retry, safe-exceptions, say, scientific, split
+     , stm, tasty, tasty-hunit, template-haskell, text, time
+     , transformers, unordered-containers, uuid, vector, wai, warp
+     }:
+     mkDerivation {
+       pname = "nakadi-client";
+       version = "0.4.0.0";
+       sha256 = "0aixamqvlm7as8cfgp8b36smh139kwp5qny51dgzsczg6sr7gdk0";
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring conduit conduit-combinators
+         conduit-extra containers hashable http-client http-client-tls
+         http-conduit http-types iso8601-time lens monad-logger mtl
+         resourcet retry safe-exceptions scientific split template-haskell
+         text time transformers unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing async base bytestring classy-prelude conduit
+         conduit-combinators conduit-extra containers hashable http-client
+         http-client-tls http-conduit http-types iso8601-time lens
+         lens-aeson monad-logger mtl random resourcet retry safe-exceptions
+         say scientific split stm tasty tasty-hunit template-haskell text
+         time transformers unordered-containers uuid vector wai warp
+       ];
+       homepage = "https://github.com/mtesseract/nakadi-haskell#readme";
+       description = "Client library for the Nakadi Event Broker";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "namecoin-update" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, lens, text, wreq }:
      mkDerivation {
@@ -140162,6 +140917,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "netwire-input-glfw_0_0_7" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , filepath, GLFW-b, mtl, netwire, netwire-input, OpenGL, stm
+     , transformers
+     }:
+     mkDerivation {
+       pname = "netwire-input-glfw";
+       version = "0.0.7";
+       sha256 = "1rsvhwxrr00qpff7adwiwci5fl6hbv8r8mvxhkq3az235w9pll8g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers GLFW-b mtl netwire-input stm
+       ];
+       executableHaskellDepends = [
+         array base bytestring containers directory filepath GLFW-b mtl
+         netwire netwire-input OpenGL transformers
+       ];
+       homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
+       description = "GLFW instance of netwire-input";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "netwire-input-javascript" = callPackage
     ({ mkDerivation, base, containers, ghcjs-base, netwire
      , netwire-input, transformers
@@ -141102,8 +141881,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-uri-json";
-       version = "0.1.0.0";
-       sha256 = "0q4h37zf8n56s7jjd5nalk8q6q5hh5d612p7w9agjqwjhl26p782";
+       version = "0.1.1.0";
+       sha256 = "0zacbdnh83559wl4mlavipg637map9sm04ch7md63rgyvvr2v79l";
        libraryHaskellDepends = [ aeson base network-uri text ];
        testHaskellDepends = [
          aeson base hspec network-uri QuickCheck test-invariant text
@@ -141111,7 +141890,7 @@ self: {
        homepage = "https://github.com/alunduil/network-uri-json";
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ alunduil ];
      }) {};
 
   "network-uri-static" = callPackage
@@ -143738,13 +144517,13 @@ self: {
      }:
      mkDerivation {
        pname = "ogmarkup";
-       version = "3.1.0";
-       sha256 = "0za23qz85r9xmw57gxi84x2zy8ddxwcdphawyfzkmxqny9kplx1r";
+       version = "4.0";
+       sha256 = "06bbh2ylxw33hik1k4ykvmb74qkcn1zda1n1m20lzcp2ji37fp8k";
        libraryHaskellDepends = [ base megaparsec mtl ];
        testHaskellDepends = [
          base hspec hspec-megaparsec megaparsec shakespeare text
        ];
-       homepage = "http://github.com/ogma-project/ogmarkup";
+       homepage = "https://nest.pijul.com/lthms/ogmarkup";
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146604,6 +147383,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_12_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , Cabal, containers, data-default, directory, filepath, hs-bibutils
+     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.12.2";
+       sha256 = "003hk7xp2r85bb3kziffr3xk4zjn178kzvfy6rh25r5p54vq9749";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath mtl pandoc pandoc-types process syb temporary text vector
+         yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath mtl pandoc
+         pandoc-types process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -152443,8 +153259,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.4";
-       sha256 = "0krcjw7bry726bgkjfsv72wq6z930jz8n5yj5dzfh51n5ps8qkcq";
+       version = "0.4.1";
+       sha256 = "10lf6fnnq1zf9v04l00f1nd4s6qq6a0pcdl72vxczmj6rn3c0kgq";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit foldl free microlens pipes
          pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -153116,14 +153932,18 @@ self: {
      }) {};
 
   "ploton" = callPackage
-    ({ mkDerivation, base, hspec, optparse-applicative, process }:
+    ({ mkDerivation, base, hspec, optparse-applicative, process, split
+     , transformers
+     }:
      mkDerivation {
        pname = "ploton";
-       version = "1.0.0.0";
-       sha256 = "1x2ypljgknyya3pwg2y323va1hl396qm30lfy982sa6p0d0m8hfg";
+       version = "1.1.0.0";
+       sha256 = "0czykw9rcmj1vci9vach4h62kbvcqrswj14d8f5nn6m75cq6swdj";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base optparse-applicative process ];
+       libraryHaskellDepends = [
+         base optparse-applicative process split transformers
+       ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/ishiy1993/ploton#readme";
@@ -154937,6 +155757,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-simple-queue_1_0_1" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
+     , hspec-discover, hspec-expectations-lifted, hspec-pg-transact
+     , monad-control, pg-transact, postgresql-simple, random, split, stm
+     , text, time, transformers
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-queue";
+       version = "1.0.1";
+       sha256 = "0gss9s2splrvwgxhkjpqvx0cg9kx9dqpw4aq2wbh8l879v2nj2rk";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions monad-control pg-transact
+         postgresql-simple random stm text time transformers
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring exceptions hspec hspec-discover
+         hspec-expectations-lifted hspec-pg-transact monad-control
+         pg-transact postgresql-simple random split stm text time
+         transformers
+       ];
+       homepage = "https://github.com/jfischoff/postgresql-queue#readme";
+       description = "A PostgreSQL backed queue";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-simple-sop" = callPackage
     ({ mkDerivation, base, generics-sop, postgresql-simple }:
      mkDerivation {
@@ -155575,8 +156421,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.57";
-       sha256 = "04hc8cywmwwjxcgj0h26ahlnxj56awq9jnvpdgxgw5rvw4q4qqb3";
+       version = "0.0.58";
+       sha256 = "02nqrryi2mjp4zcail23rh0ysqnc8i97wzn77bq7ksimqwzynabq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156943,8 +157789,8 @@ self: {
      }:
      mkDerivation {
        pname = "process-streaming";
-       version = "0.9.1.2";
-       sha256 = "0kjq8bylhab6zhszf9vfnvzjkzfkh3bcgkkys7f13f6mrdp02bjz";
+       version = "0.9.2.1";
+       sha256 = "1p1nfb09sg9krwm7k6j8y5ggbc28yddlkf2yifs06iqfkcmbsbm6";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit free kan-extensions pipes
          pipes-bytestring pipes-concurrency pipes-parse pipes-safe
@@ -157252,12 +158098,12 @@ self: {
      }) {};
 
   "progress-meter" = callPackage
-    ({ mkDerivation, async, base, containers, stm }:
+    ({ mkDerivation, ansi-terminal, async, base, stm }:
      mkDerivation {
        pname = "progress-meter";
-       version = "0.1.0";
-       sha256 = "0xbrs2ydi64vllwz55b100ggwdcixi2p8zxlbxg7hg7s6ki244xf";
-       libraryHaskellDepends = [ async base containers stm ];
+       version = "1.0.0.1";
+       sha256 = "1mdzwbzkf9ja7i21hds26gqn2ll4hnidbcq145yigkfzv93r6hq6";
+       libraryHaskellDepends = [ ansi-terminal async base stm ];
        homepage = "https://github.com/esoeylemez/progress-meter";
        description = "Live diagnostics for concurrent activity";
        license = stdenv.lib.licenses.bsd3;
@@ -159628,6 +160474,19 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "qq-literals" = callPackage
+    ({ mkDerivation, base, network-uri, template-haskell }:
+     mkDerivation {
+       pname = "qq-literals";
+       version = "0.1.0.0";
+       sha256 = "1fsl1639jzik9zrkks1badx6pd303rjdm3dmnb6cfjjb1jg50cqr";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base network-uri template-haskell ];
+       homepage = "https://github.com/hdgarrood/qq-literals";
+       description = "Compile-time checked literal values via QuasiQuoters";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "qr-imager" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
      , either, haskell-qrencode, hspec, jose-jwt, JuicyPixels
@@ -162149,6 +163008,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_0_3_8" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, filepath, http-client, http-client-tls, http-types
+     , tasty, tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.3.8";
+       sha256 = "1zd5dc21y60yjzbwgr8vf099y0rqmdirn1mq6s03jpiyar33lv3b";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base filepath 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
@@ -162165,6 +163044,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel-wai_0_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-client, ratel, wai
+     }:
+     mkDerivation {
+       pname = "ratel-wai";
+       version = "0.3.2";
+       sha256 = "1f38xivw19ic002idr936859rwmz2g9nmhbwxvsf4fw3lm31qwpa";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-client ratel wai
+       ];
+       homepage = "https://github.com/tfausak/ratel-wai#readme";
+       description = "Notify Honeybadger about exceptions via a WAI middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rating-systems" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -169459,8 +170355,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy-store";
-       version = "0.9.5";
-       sha256 = "177v32sn3bxk3a4f4lg9vh4yc1lgylzrwzs0n6k4jrs8jxlz74iw";
+       version = "0.9.6";
+       sha256 = "1x82j4zw26pp38bcx4rnmz7ikpz8nf9mc4pkpcg9c9x76p8kxsfa";
        libraryHaskellDepends = [
          array base bytestring containers old-time store store-core
          template-haskell text time vector
@@ -169679,8 +170575,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "salve";
-       version = "0.0.9";
-       sha256 = "0x16rdrm8i2jwbi1zd7zj43r3h7jb9fzb33b5nbwkwfh397sm11h";
+       version = "0.0.10";
+       sha256 = "0d31pza3i06bs95ngspkabqrlfqjqmarmfjbpqir2xd1bz3xybjr";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/tfausak/salve#readme";
@@ -171660,6 +172556,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2_mixer;};
 
+  "sdl2-mixer_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, lifted-base
+     , monad-control, sdl2, SDL2_mixer, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "sdl2-mixer";
+       version = "1.1.0";
+       sha256 = "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring data-default-class lifted-base monad-control sdl2
+         template-haskell vector
+       ];
+       librarySystemDepends = [ SDL2_mixer ];
+       libraryPkgconfigDepends = [ SDL2_mixer ];
+       description = "Bindings to SDL2_mixer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2_mixer;};
+
   "sdl2-ttf" = callPackage
     ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
      , template-haskell, text, transformers
@@ -173362,8 +174279,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.5.0.0";
-       sha256 = "1ivlc7ivn4rn2appxyv2cgn4s812s82d3a8q9ykfy1yhpjygk9hp";
+       version = "0.5.1.0";
+       sha256 = "113pjs52nvi94bfx1ys4lanyvzkrlmb1p2y8sxhhb4bal917xki1";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers http-api-data mtl
          pwstore-fast servant servant-auth-token-api servant-server text
@@ -173384,8 +174301,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-acid";
-       version = "0.5.0.0";
-       sha256 = "1hvslg23l43k6wz6z84xcm3sv0lxgnvcsrx7z8493zyav9lnlx6h";
+       version = "0.5.1.0";
+       sha256 = "1kxmgdj7bz2bbs6n9kfp28y9a9cvc2xk8345jnd4ks0iw43xjwr3";
        libraryHaskellDepends = [
          acid-state aeson-injector base bytestring containers ghc-prim
          monad-control mtl safe safecopy servant-auth-token
@@ -173404,8 +174321,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.4.2.2";
-       sha256 = "0dnaqhri1hg1c3gmlpnpyk21q4cq9j513fnd3g1m9k7mkc6h6bgv";
+       version = "0.5.1.0";
+       sha256 = "0kn25ldc774zx8r5hnrd7ibdm4g3769f99g8vl99x0miplpz0v0a";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -173425,8 +174342,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-leveldb";
-       version = "0.5.0.0";
-       sha256 = "1v1h9jpc9ypdd6sfcb9w4lhv2ldsnlcpmmsghbdky50vqmq1y8qj";
+       version = "0.5.1.0";
+       sha256 = "0bkprvi9zwc599ynkabjsk1m9wpbvfpmhzjx6rqj92m1nki62264";
        libraryHaskellDepends = [
          aeson-injector base bytestring concurrent-extra containers
          exceptions lens leveldb-haskell monad-control mtl resourcet safe
@@ -173448,8 +174365,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-persistent";
-       version = "0.6.0.0";
-       sha256 = "18y9g9pfzbhv35pfcr4973h320p8ify8nf4vllcdv83whfm48bc1";
+       version = "0.6.1.0";
+       sha256 = "1ni74vk121ncfkdjksf15g6686c2acbg22dn1srzwyngx5iwjcnc";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers monad-control mtl
          persistent persistent-template servant-auth-token
@@ -173471,8 +174388,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-rocksdb";
-       version = "0.5.0.0";
-       sha256 = "0cr8qgkv89sps6ykv0v1bng2xk4g7r00fjnmgjp58kpc18pvg4vl";
+       version = "0.5.1.0";
+       sha256 = "1xbnqv3b64r1xnzra2pdysjg5r9kxwxaya5rfrcgl8fz1b4n4hbb";
        libraryHaskellDepends = [
          aeson-injector base bytestring concurrent-extra containers
          exceptions lens monad-control mtl resourcet rocksdb-haskell safe
@@ -173951,19 +174868,19 @@ self: {
   "servant-github-webhook" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , cryptonite, github, http-types, memory, servant, servant-server
-     , string-conversions, text, transformers, wai, warp
+     , string-conversions, text, wai, warp
      }:
      mkDerivation {
        pname = "servant-github-webhook";
-       version = "0.3.1.0";
-       sha256 = "0px2pxw6piqjh2vawf0mkhcf96pqk2rm0izvbsy5xcd011qlvfhq";
+       version = "0.3.2.0";
+       sha256 = "15n6nn03m2gxhd4rhavcxny13q962db3c4fi9gjzix6w56vwqwm7";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite github
          http-types memory servant servant-server string-conversions text
-         transformers wai
+         wai
        ];
        testHaskellDepends = [
-         aeson base bytestring servant-server transformers wai warp
+         aeson base bytestring servant-server wai warp
        ];
        homepage = "https://github.com/tsani/servant-github-webhook";
        description = "Servant combinators to facilitate writing GitHub webhooks";
@@ -174285,6 +175202,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-proto-lens" = callPackage
+    ({ mkDerivation, async, base, bytestring, data-default-class
+     , http-client, http-media, HUnit, lens, proto-lens
+     , proto-lens-protobuf-types, servant, servant-client
+     , servant-server, test-framework, test-framework-hunit, warp
+     }:
+     mkDerivation {
+       pname = "servant-proto-lens";
+       version = "0.1.0.1";
+       sha256 = "1sa3vkr4vd6lvclscb4ki7ph17pdvq8ka22gmymz0yr760nx398a";
+       libraryHaskellDepends = [
+         base bytestring http-media proto-lens servant
+       ];
+       testHaskellDepends = [
+         async base data-default-class http-client HUnit lens proto-lens
+         proto-lens-protobuf-types servant-client servant-server
+         test-framework test-framework-hunit warp
+       ];
+       homepage = "https://github.com/plredmond/servant-proto-lens";
+       description = "Servant Content-Type for proto-lens protobuf modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-purescript" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, http-types, lens, mainland-pretty, purescript-bridge
@@ -178132,8 +179072,8 @@ self: {
      }:
      mkDerivation {
        pname = "siren-json";
-       version = "0.1.0.2";
-       sha256 = "0jkrqqfl713vpmypm7bkzvv5sia23zjhk0l90slyk4cmcmxn1s1a";
+       version = "0.1.2.0";
+       sha256 = "0rzc7brcq51j3vrlfr59fysig4fgfja3z07rz0pgg82dl8wxp9fk";
        libraryHaskellDepends = [
          aeson base bytestring containers http-media http-types network-uri
          network-uri-json text unordered-containers
@@ -178146,7 +179086,7 @@ self: {
        homepage = "https://github.com/alunduil/siren-json.hs";
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ alunduil ];
      }) {};
 
   "sirkel" = callPackage
@@ -178703,6 +179643,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "slate" = callPackage
+    ({ mkDerivation, base, directory, filepath, optparse-applicative }:
+     mkDerivation {
+       pname = "slate";
+       version = "0.3.0.0";
+       sha256 = "0whwsaxxz43ahz3x0l0vhq9m1mw2sxzh26mpxf8wzjka4xdizrwm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       executableHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       testHaskellDepends = [
+         base directory filepath optparse-applicative
+       ];
+       homepage = "https://github.com/evuez/slate#readme";
+       description = "A note taking CLI tool";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "slave-thread" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph
      , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore
@@ -178931,6 +179893,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck_1_1_3_1" = callPackage
+    ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
+     mkDerivation {
+       pname = "smallcheck";
+       version = "1.1.3.1";
+       sha256 = "1lmx0sxkhryra7laln8m7z0518jshahsvz121xybajjcz9pz3xcz";
+       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
+       homepage = "https://github.com/feuerbach/smallcheck";
+       description = "A property-based testing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallcheck-laws" = callPackage
     ({ mkDerivation, base, smallcheck, smallcheck-series }:
      mkDerivation {
@@ -181248,6 +182223,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "socks_0_5_6" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, network }:
+     mkDerivation {
+       pname = "socks";
+       version = "0.5.6";
+       sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs";
+       libraryHaskellDepends = [ base bytestring cereal network ];
+       homepage = "http://github.com/vincenthz/hs-socks";
+       description = "Socks proxy (ver 5)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sodium" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -181759,8 +182747,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparkle";
-       version = "0.7.1";
-       sha256 = "1494c6zwn8q3aj9x07r2iikkbnxf8r3aw823dip47sygc95wy39w";
+       version = "0.7.2.1";
+       sha256 = "1bfgj1a43aj4nwzq1471l2sb9il7sh0czc22fhmd8mhpbz6wlnsp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -183469,10 +184457,10 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.6.1";
-       sha256 = "0mf95h83qrgidkfvwm47w262fprsh8g5rf9mzkc1v2ifbn9b93v9";
+       version = "1.6.3";
+       sha256 = "0ylika6qf7agj07wh47xjirhg74l63lx80q0xm41yd9g5ssk9cbj";
        revision = "1";
-       editedCabalFile = "103w999pac6337idj241iil52rssjp4vn5r5bvgl72sn64wxkm4x";
+       editedCabalFile = "0bf0szsf3gq7q41ck3ccyfjy13911nhas6is3id9mx7f47bygpxx";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -184668,13 +185656,11 @@ self: {
     ({ mkDerivation, base, hspec, vector }:
      mkDerivation {
        pname = "stb-image-redux";
-       version = "0.2.1.0";
-       sha256 = "07gbj7qqgm3dwx6bign8qma3a0187p5nil7z612976bdpz9abr60";
-       revision = "2";
-       editedCabalFile = "1ils1w36y3c4ik0mxnadrhxw1fy426av438ckg2fgnzys0i5zqp2";
+       version = "0.2.1.2";
+       sha256 = "1s23f38za0zv9vzj4qn5qq2ajhgr6g9gsd2nck2hmkqfjpw1mx1v";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
-       homepage = "https://github.com/sasinestro/stb-image-redux#readme";
+       homepage = "https://github.com/typedrat/stb-image-redux#readme";
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186716,6 +187702,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "strive_4_0_3" = 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 = "4.0.3";
+       sha256 = "1b1shq0jznyx9cbir33diflw1602py651rqj2hfjrgdywjrac8fq";
+       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 {
@@ -189765,10 +190771,8 @@ self: {
      }:
      mkDerivation {
        pname = "taggy";
-       version = "0.2.0";
-       sha256 = "01q2ccf3a8akaifh79ajnfr5yrjsq4xihq0pl7lsz173n7mhnsy3";
-       revision = "1";
-       editedCabalFile = "02xmvs9m977szhf5cgy31rbadi662g194giq3djzvsd41c1sshq3";
+       version = "0.2.1";
+       sha256 = "1xmxwg024k5q4ah0pfn6nhyrznskgwg6anw558qzb4k5rjk3b7nq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -190447,15 +191451,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty_0_12" = callPackage
+  "tasty_0_12_0_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers
      , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
      , unbounded-delays, unix
      }:
      mkDerivation {
        pname = "tasty";
-       version = "0.12";
-       sha256 = "0840ziawhj0lrzn927nx9lww6wxc5krvf0c3xygl577vvxh4adg1";
+       version = "0.12.0.1";
+       sha256 = "1qxhqb4kbzr2yw091pg3kg5xcn0015xjhi3cx6dl7qgjc7wx20zb";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers deepseq mtl
          optparse-applicative regex-tdfa stm tagged unbounded-delays unix
@@ -190518,6 +191522,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_1_0_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "1.0.0.0";
+       sha256 = "1gybk59c1jcbpmyrddfqs45z026rvfk6idd99shds3qhlfbm4897";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, Glob
      , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
@@ -190545,6 +191562,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-discover_4_1_2" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, Glob
+     , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-discover";
+       version = "4.1.2";
+       sha256 = "1mblgkilbhq9g00hbi1f07r3z5gh8aj9smyas1b1svd1v38szwkj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath Glob
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath Glob
+       ];
+       testHaskellDepends = [
+         base containers directory filepath Glob hedgehog tasty
+         tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/lwm/tasty-discover#readme";
+       description = "Test discovery for the tasty framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-expected-failure" = callPackage
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
@@ -192841,6 +193886,31 @@ self: {
        license = "GPL";
      }) {};
 
+  "texmath_0_10_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.10.1";
+       sha256 = "04qygn60f7920vm1f2xkf686kaimng8k030xlp3iy2hbgs33sxbj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -193197,6 +194267,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-ldap_0_1_1_10" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+     , containers, dlist, QuickCheck, quickcheck-simple, random
+     , transformers
+     }:
+     mkDerivation {
+       pname = "text-ldap";
+       version = "0.1.1.10";
+       sha256 = "13wjarsshp64cc632bqmckx664a57w7cnlm8gs7rfp1bcm7vdnjk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring bytestring containers dlist
+         transformers
+       ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base bytestring QuickCheck quickcheck-simple random
+       ];
+       description = "Parser and Printer for LDAP text data stream";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-lens" = callPackage
     ({ mkDerivation, base, extra, hspec, lens, text }:
      mkDerivation {
@@ -199474,6 +200568,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "twitter-conduit_0_2_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base
+     , bytestring, Cabal, cabal-doctest, case-insensitive, conduit
+     , conduit-extra, containers, data-default, doctest, exceptions
+     , hlint, hspec, http-client, http-conduit, http-types, lens
+     , lens-aeson, network-uri, resourcet, template-haskell, text, time
+     , transformers, transformers-base, twitter-types
+     , twitter-types-lens
+     }:
+     mkDerivation {
+       pname = "twitter-conduit";
+       version = "0.2.3";
+       sha256 = "1xspyig287y2x9y0f6390jd8zmzc2nf2zcsnjd9y69a1qjchviv9";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec authenticate-oauth base bytestring conduit
+         conduit-extra containers data-default exceptions http-client
+         http-conduit http-types lens lens-aeson resourcet template-haskell
+         text time transformers transformers-base twitter-types
+         twitter-types-lens
+       ];
+       testHaskellDepends = [
+         aeson attoparsec authenticate-oauth base bytestring
+         case-insensitive conduit conduit-extra containers data-default
+         doctest hlint hspec http-client http-conduit http-types lens
+         lens-aeson network-uri resourcet template-haskell text time
+         twitter-types twitter-types-lens
+       ];
+       homepage = "https://github.com/himura/twitter-conduit";
+       description = "Twitter API package with conduit interface and Streaming API support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "twitter-enumerator" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-enumerator
      , authenticate, base, bytestring, containers, enumerator
@@ -200962,6 +202090,8 @@ self: {
        pname = "uhc-util";
        version = "0.1.6.7";
        sha256 = "0xaa9xp7yaj6mjq392x2jyi6rdplfabmhbwwq4ammr4wbqbjfjyl";
+       revision = "1";
+       editedCabalFile = "0ngrfb87vq5r114nlkbkkrzpa6hy6cyws3z1zf339aaixb8g1763";
        libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable logict-state mtl pqueue process time time-compat
@@ -202861,6 +203991,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring_0_3_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, blaze-builder
+     , bytestring, containers, criterion, deepseq, deepseq-generics
+     , fail, generics-sop, HUnit, network-uri, QuickCheck
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, th-lift-instances
+     , transformers
+     }:
+     mkDerivation {
+       pname = "uri-bytestring";
+       version = "0.3.1.0";
+       sha256 = "04qjv1sgyrdg538290p9hqnvyxnahvr5cjwl8vm1rn9j0fv3ymq9";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring containers fail
+         template-haskell th-lift-instances
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat blaze-builder bytestring containers
+         generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck transformers
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq deepseq-generics
+         network-uri
+       ];
+       homepage = "https://github.com/Soostone/uri-bytestring";
+       description = "Haskell URI parsing as ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uri-bytestring-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
      mkDerivation {
@@ -203457,8 +204618,8 @@ self: {
        pname = "utf8-string";
        version = "1.0.1.1";
        sha256 = "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv";
-       revision = "2";
-       editedCabalFile = "1b97s9picjl689hcz8scinv7c8k5iaal1livqr0l1l8yc4h0imhr";
+       revision = "3";
+       editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
@@ -203824,8 +204985,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "uulib";
-       version = "0.9.22";
-       sha256 = "1b9in4xbyi518iix5ln765z99q8prdw6p6lx5dz3ckl36dfs3l6d";
+       version = "0.9.23";
+       sha256 = "1v9gwy1zdkyc8f36n52p127gz1r95ykaqklshg0abiai4xnr1yy6";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
@@ -210143,8 +211304,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.37";
-       sha256 = "09ry5bq0hmrdv09hd9v16r4dyyyfzpf785sfrz3by6hal8bkwj6w";
+       version = "0.3.38";
+       sha256 = "1csd52wflvxv8iaaflw44wxr6ycmrf1k5d1r5yv9c7skswarnmk3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211076,6 +212237,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_6" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.6";
+       sha256 = "1g2k48mngg8fr6cvkimjr39jc83b87lva0320bwdnf19nyz1fy9y";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       homepage = "https://github.com/tfausak/wuss#readme";
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
@@ -214487,8 +215664,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-hmac-keccak";
-       version = "0.0.0.3";
-       sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8";
+       version = "0.0.0.4";
+       sha256 = "17i3xxxdpq58q7y80xrh266lzkl8dh686v25kpapn2r0c4vxm291";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cryptonite mtl persistent random shakespeare
@@ -217352,22 +218529,22 @@ self: {
      }) {};
 
   "zifter" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
-     , filepath, genvalidity, genvalidity-hspec, genvalidity-path, hspec
-     , optparse-applicative, path, path-io, process, QuickCheck, safe
-     , stm, validity, validity-path
+    ({ mkDerivation, ansi-terminal, async, base, colour, directory
+     , exceptions, filepath, genvalidity, genvalidity-hspec
+     , genvalidity-path, hspec, optparse-applicative, path, path-io
+     , process, QuickCheck, safe, stm, validity, validity-path
      }:
      mkDerivation {
        pname = "zifter";
-       version = "0.0.1.3";
-       sha256 = "0hams2ayxm73p2m032vjxnrdpg7d8iz293sx29h011siv1xjyaab";
+       version = "0.0.1.5";
+       sha256 = "06bnj0zxxmspzw5rpc53hxksdd1h9nd6viwrvfmgj1fam1fhh856";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity
          validity-path
        ];
        testHaskellDepends = [
-         ansi-terminal base directory genvalidity genvalidity-hspec
+         ansi-terminal base colour directory genvalidity genvalidity-hspec
          genvalidity-path hspec path path-io QuickCheck stm
        ];
        homepage = "http://cs-syd.eu";
@@ -217382,8 +218559,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-cabal";
-       version = "0.0.0.2";
-       sha256 = "009vhy3x5hb24n1ylr31hvgfk2bic1r9yy8nk78ym1yhjb4vrrj5";
+       version = "0.0.0.3";
+       sha256 = "04nwyma5p6ka86zh2hczli4842l5hg6kvhsv3bwwf722bkhzdznq";
        libraryHaskellDepends = [
          base directory filepath path path-io process safe zifter
        ];
@@ -217397,8 +218574,8 @@ self: {
     ({ mkDerivation, base, path, process, zifter }:
      mkDerivation {
        pname = "zifter-git";
-       version = "0.0.0.0";
-       sha256 = "0mq5aa7nljbdgimvs948kzn16m74771jyswbk0fq6jqyrb80li4j";
+       version = "0.0.0.1";
+       sha256 = "1fsrair0c0a6j2jmghcxvbs3dr6j7gzh3yfimflva64nvwfx8vb8";
        libraryHaskellDepends = [ base path process zifter ];
        homepage = "http://cs-syd.eu";
        description = "zifter-git";
@@ -217412,8 +218589,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-google-java-format";
-       version = "0.0.0.0";
-       sha256 = "0kl3mgg4hbzl9ifd8x30nnczrygs5ziqhmz47l5nzx40ja177546";
+       version = "0.0.0.1";
+       sha256 = "00am6djnk7ivb9cd5v59axlbi3da70m2fzfghmzq6dgvlkghng0c";
        libraryHaskellDepends = [
          base filepath path path-io process safe zifter
        ];
@@ -217429,8 +218606,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-hindent";
-       version = "0.0.0.1";
-       sha256 = "10qwlvw1zq5q530xlh69ag9ap4jl5gv5xj7sc4bwjglbbcw39iag";
+       version = "0.0.0.2";
+       sha256 = "106iv5gqqlmvdjs1z4n7p3m11c36x4531395fpxh5sfzc8mrhgg2";
        libraryHaskellDepends = [
          base directory filepath path path-io process safe zifter
        ];
@@ -217445,10 +218622,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-hlint";
-       version = "0.0.0.0";
-       sha256 = "0bvp6l5k42ls996h3qc7wy4qgcx0phd8hf0l99kcqan2gpx8qn6p";
-       revision = "1";
-       editedCabalFile = "08wmzid4g3av9w86ysybvg2mwkfx63b19v2i71hvik48bl5v6mlv";
+       version = "0.0.0.1";
+       sha256 = "1303crjb500psmsnc3ivy67qgz5gdbd3dsfnf3qis39amxmw1wf4";
        libraryHaskellDepends = [
          base filepath hlint path path-io safe zifter
        ];
@@ -217464,8 +218639,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter-stack";
-       version = "0.0.0.6";
-       sha256 = "0z2y77fd9ij8s9qqyjik1syh5ry169bda6wlsa4lj658f8yghggc";
+       version = "0.0.0.8";
+       sha256 = "03grslbsd7x1gj6fw80vsmj2cyfvrfmlqqzcrx3j2rk0icax0nla";
        libraryHaskellDepends = [
          base Cabal directory filepath path path-io process safe zifter
        ];

From 48c4901a7afdb4f4b183a1711cec6acd58390495 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 21 Dec 2017 11:08:46 -0500
Subject: [PATCH 098/122] taggy: remove patch

The newly released 0.2.1 includes it.
---
 pkgs/development/haskell-modules/configuration-common.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 58de439d839c..218d4a140ec5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -905,13 +905,6 @@ self: super: {
   # https://github.com/takano-akio/filelock/issues/5
   filelock = dontCheck super.filelock;
 
-  # https://github.com/alpmestan/taggy/issues/{19,20}
-  taggy = appendPatch super.taggy (pkgs.fetchpatch {
-    name = "blaze-markup.patch";
-    url = "https://github.com/alpmestan/taggy/commit/5456c2fa4d377f7802ec5df3d5f50c4ccab2e8ed.patch";
-    sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7";
-  });
-
   # cryptol-2.5.0 doesn't want happy 1.19.6+.
   cryptol = super.cryptol.override { happy = self.happy_1_19_5; };
 

From 99c5976a1a1789de32c9ae6eac8fb9310b32b21b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= <mimadrid@ucm.es>
Date: Tue, 26 Dec 2017 11:27:01 +0100
Subject: [PATCH 099/122] tig: 2.3.0 -> 2.3.2

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

diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index bed0ef358271..07ea2be7ad34 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "tig";
-  version = "2.3.0";
+  version = "2.3.2";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "jonas";
     repo = pname;
     rev = name;
-    sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5";
+    sha256 = "14cdlrdxbl8vzqw86fm3wyaixh607z47shc4dwd6rd9vj05w0m97";
   };
 
   nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];

From 7f91eb94be02bcc403f31d96eebb59a0f07400d8 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sun, 24 Dec 2017 21:26:24 +0000
Subject: [PATCH 100/122] haskell docs: change wording in the "Miscellaneous
 Topics" section

---
 doc/languages-frameworks/haskell.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index bf8bcd7e704a..629db289ab1d 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -581,8 +581,8 @@ nix-shell "<nixpkgs>" -A haskellPackages.bar.env
 Every Haskell package set takes a function called `overrides` that you can use
 to manipulate the package as much as you please. One useful application of this
 feature is to replace the default `mkDerivation` function with one that enables
-library profiling for all packages. To accomplish that, add configure the
-following snippet in your `~/.config/nixpkgs/config.nix` file:
+library profiling for all packages. To accomplish that add the following
+snippet to your `~/.config/nixpkgs/config.nix` file:
 ```nix
 {
   packageOverrides = super: let self = super.pkgs; in

From b03ac7d22b65f4719c8efbdf3400b5c2a927aa79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Dec 2017 15:11:44 +0100
Subject: [PATCH 101/122] jhc: drop broken Haskell compiler

---
 pkgs/development/compilers/jhc/default.nix | 32 ----------------------
 pkgs/top-level/aliases.nix                 |  2 +-
 pkgs/top-level/haskell-packages.nix        |  5 ----
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/development/compilers/jhc/default.nix

diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
deleted file mode 100644
index 6b8c6599062e..000000000000
--- a/pkgs/development/compilers/jhc/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, perl, ghcWithPackages }:
-
-let ghc = ghcWithPackages (hpkgs: with hpkgs; [
-            binary zlib utf8-string readline fgl regex-compat HsSyck random
-          ]);
-in
-
-stdenv.mkDerivation rec {
-  name = "jhc-${version}";
-  version = "0.8.2";
-
-  src = fetchurl {
-    url    = "http://repetae.net/dist/${name}.tar.gz";
-    sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz";
-  };
-
-  buildInputs = [ perl ghc ];
-
-  preConfigure = ''
-    configureFlagsArray+=("CC=cc")
-    configureFlagsArray+=("--with-hsc2hs=${ghc}/bin/hsc2hs --cc=cc")
-  '';
-
-  meta = {
-    description = "Whole-program, globally optimizing Haskell compiler";
-    homepage = http://repetae.net/computer/jhc/;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = ["x86_64-linux"]; # 32 bit builds are broken
-    maintainers = with stdenv.lib.maintainers; [ aforemny thoughtpolice ];
-    broken = true; # https://hydra.nixos.org/build/61700723
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 37d764205099..6eb826c073f6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -79,7 +79,7 @@ mapAliases (rec {
   htmlTidy = html-tidy;  # added 2014-12-06
   iana_etc = iana-etc;  # added 2017-03-08
   idea = jetbrains; # added 2017-04-03
-  inherit (haskell.compiler) jhc uhc;   # 2015-05-15
+  inherit (haskell.compiler) uhc;   # 2015-05-15
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0d620ce2b295..e980db5cc705 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -13,7 +13,6 @@ let
     "ghcjs"
     "ghcjsHEAD"
     "ghcCross"
-    "jhc"
     "uhc"
     "integer-simple"
   ];
@@ -91,10 +90,6 @@ in rec {
       inherit (bootPkgs) hscolour alex happy;
     };
 
-    jhc = callPackage ../development/compilers/jhc {
-      inherit (packages.ghc763) ghcWithPackages;
-    };
-
     uhc = callPackage ../development/compilers/uhc/default.nix ({
       stdenv = pkgs.clangStdenv;
       inherit (pkgs.haskellPackages) ghcWithPackages;

From 63e3eae02f7342c8fc62bc458dae3bea95815f7d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 25 Dec 2017 14:50:20 +0100
Subject: [PATCH 102/122] linux: 4.14.8 -> 4.14.9

Besides fixes for the recent BPF issues there is also a patch included
that fixes booting on aarch64 (e.g. RPi3) ;-)
---
 pkgs/os-specific/linux/kernel/linux-4.14.nix    | 4 ++--
 pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index ffb0974e0522..c854f880ab94 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 import ./generic.nix (args // rec {
-  version = "4.14.8";
+  version = "4.14.9";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ import ./generic.nix (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0cwk9liv79hw5l34xvwnf05spx1jvv8q8w9lfbw4lw8xldxwbg3f";
+    sha256 = "1vqllh36wss4dsdvb12zchy6hjaniyxcla5cg8962xrkim2bpk6g";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 9124559ef7a0..355fbde62680 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -234,7 +234,7 @@ let
     };
 in
 
-assert stdenv.lib.versionAtLeast version "4.15" -> libelf != null;
+assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null;
 assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
 stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // {
   name = "linux-${version}";
@@ -243,7 +243,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
 
   nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
       ++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools
-      ++ optional (stdenv.lib.versionAtLeast version "4.15") libelf
+      ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
       ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
       ;
 

From b0047e77820c7dbfdba935bf77f0889142bd41a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 Dec 2017 16:41:36 +0100
Subject: [PATCH 103/122] linux: 4.9.71 -> 4.9.72 (security)

Fixes CVE-2017-16996, just as the preceding 4.14 update.
---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index ef3265c7c303..f45841d0284c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.71";
+  version = "4.9.72";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "173nvdshckhdlisn08pf6cal9bhlj8ra569y26013hsfzd09gzgi";
+    sha256 = "0fxqfqcqn6rk6rxzmy8r3vgzvy9xlnb3hvg2rniykbcyxgqh3wk9";
   };
 } // (args.argsOverride or {}))

From 416d9bd7f82ec8e378f42cfeee930179c8571da8 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Tue, 26 Dec 2017 16:44:31 +0000
Subject: [PATCH 104/122] haskellPackages.{SC,sc}alendar: nullify to fix ofborg
 eval

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 218d4a140ec5..a7ba0dea10dc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -951,9 +951,9 @@ self: super: {
   # Hoogle needs a newer version than lts-10 provides.
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; };
 
-  # These packages depend on each other, forming an infinte loop.
-  scalendar = markBroken super.scalendar;
-  SCalendar = markBroken super.SCalendar;
+  # These packages depend on each other, forming an infinite loop.
+  scalendar = null;
+  SCalendar = null;
 
   # Needs QuickCheck <2.10, which we don't have.
   edit-distance = doJailbreak super.edit-distance;

From e7b51bb38f87b461501feae48892c25ee5f672a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 Dec 2017 18:02:44 +0100
Subject: [PATCH 105/122] quicktun: fixup build with gnutar-1.30

/cc #32816.
---
 pkgs/tools/networking/quicktun/default.nix   |  2 ++
 pkgs/tools/networking/quicktun/tar-1.30.diff | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/networking/quicktun/tar-1.30.diff

diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index 6332d6c85774..ceee8cca1aae 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ydvwasj84qljfbzh6lmhyzjc20yw24a0v2mykp8afsm97zzlqgx";
   };
 
+  patches = [ ./tar-1.30.diff ]; # quicktun master seems not to need this
+
   buildInputs = [ libsodium ];
 
   buildPhase = "bash build.sh";
diff --git a/pkgs/tools/networking/quicktun/tar-1.30.diff b/pkgs/tools/networking/quicktun/tar-1.30.diff
new file mode 100644
index 000000000000..88498e542807
--- /dev/null
+++ b/pkgs/tools/networking/quicktun/tar-1.30.diff
@@ -0,0 +1,19 @@
+Fix build with gnutar-1.30
+
+Creating source archive...
+tar: The following options were used after any non-optional arguments in archive create or update mode.  These options are positional and affect only arguments that follow them.  Please, rearrange them properly.
+tar: --exclude 'debian/data' has no effect
+tar: Exiting with failure status due to previous errors
+diff --git a/build.sh b/build.sh
+index 0ea0403..725178c 100755
+--- a/build.sh
++++ b/build.sh
+@@ -25,7 +25,7 @@ rm -rf out/ obj/ tmp/
+ mkdir -p out
+ if [ "$1" != "debian" ]; then
+ 	echo Creating source archive...
+-	$tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh debian src version --exclude "debian/data"
++	$tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" --exclude "debian/data" build.sh clean.sh debian src version
+ fi
+ 
+ mkdir -p obj tmp tmp/include tmp/lib

From 482597b4bcd3b532bdfc9e57afa44e5d917f2f28 Mon Sep 17 00:00:00 2001
From: idontgetoutmuch <dominic@steinitz.org>
Date: Tue, 26 Dec 2017 17:44:13 +0000
Subject: [PATCH 106/122] cmdstan: 2.9.0 -> 2.17.1 (#33076)

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

diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index 6ac5165b7e9e..3f25041f1753 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "cmdstan-2.9.0";
+  name = "cmdstan-2.17.1";
 
   src = fetchurl {
-    url = "https://github.com/stan-dev/cmdstan/releases/download/v2.9.0/cmdstan-2.9.0.tar.gz";
-    sha256 = "08bim6nxgam989152hm0ga1rfb33mr71pwsym1nmfmavma68bwm9";
+    url = "https://github.com/stan-dev/cmdstan/releases/download/v2.17.1/cmdstan-2.17.1.tar.gz";
+    sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j";
   };
 
   buildFlags = "build";
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://mc-stan.org/interfaces/cmdstan.html;
     license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 63a66441cd2ae7231146b8cfacb070e11b175ff5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Dec 2017 02:53:57 +0200
Subject: [PATCH 107/122] fsmon: 1.4 -> 1.5

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

diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix
index d3a1a7124669..f9e40b6b7867 100644
--- a/pkgs/tools/misc/fsmon/default.nix
+++ b/pkgs/tools/misc/fsmon/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "fsmon-${version}";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "nowsecure";
     repo = "fsmon";
     rev = "${version}";
-    sha256 = "0sqld41jn142d4zbqmylzrnx1km7xs6r8dnmf453gyhi3yzdbr1j";
+    sha256 = "1b99cd5k2zh30sagp3f55jvj1r48scxibv7aqqc2sp82sci59npg";
   };
 
   installPhase = ''

From c1ed49220a552fcce4708503a301b5d0281d8330 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Dec 2017 02:54:18 +0200
Subject: [PATCH 108/122] fio: 3.2 -> 3.3

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

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 963c383b66e9..89fb5f05ac97 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
 let
-  version = "3.2";
-  sha256 = "1sp83lxhrwg4627bma3pkcfg8yd1w3r6p02rdldv083962ljkinm";
+  version = "3.3";
+  sha256 = "0ipdpdn6rlsbppqjddyyk8c6rg1dl17d62dwwm0ijybi0m7imy1p";
 in
 
 stdenv.mkDerivation rec {

From d6cc334d6beefb9ee4d82f5734211828b263f3f5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 26 Dec 2017 18:23:10 +0200
Subject: [PATCH 109/122] picocom: 2.2 -> 3.0

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

diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix
index bfafe0151a0a..dfd81bd97423 100644
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/pkgs/tools/misc/picocom/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "picocom-${version}";
-  version = "2.2";
+  version = "3.0";
 
   src = fetchFromGitHub {
     owner = "npat-efault";
     repo = "picocom";
     rev = version;
-    sha256 = "06b2ic34dnxc73cprc5imi3iamlhsv623sbg9vj5h5rvs586dwjx";
+    sha256 = "1i75ksm44la8kn82v71hzq0q5642y108rascdb94zilhagdhilk2";
   };
 
   buildInputs = [ makeWrapper ];

From e3b0c0350793349afc1602431da2895eb0041a82 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 19 Nov 2017 03:33:06 +0200
Subject: [PATCH 110/122] update-source-version: Escape plus sign if it occurs
 in version

---
 pkgs/common-updater/scripts/update-source-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 13f8adf56771..c5f7db281625 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -39,8 +39,8 @@ if [ "$oldVersion" = "$newVersion" ]; then
     exit 0
 fi
 
-# Escape dots, there should not be any other regex characters allowed in store path names
-oldVersion=$(echo "$oldVersion" | sed -re 's|\.|\\.|g')
+# Escape regex metacharacter that are allowed in store path names
+oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
 
 if [ $(grep -c -E "^\s*(let\b)?\s*version\s+=\s+\"$oldVersion\"" "$nixFile") = 1 ]; then
     pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|"

From 0101944621e18096c3f1404654bb43a55861910f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 19 Nov 2017 03:33:31 +0200
Subject: [PATCH 111/122] update-source-version: Check for sources not
 dependent on ${version}

---
 pkgs/common-updater/scripts/update-source-version | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index c5f7db281625..4c4cb56fb320 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -82,6 +82,11 @@ if [ -z "$newHash" ]; then
     die "Couldn't figure out new hash of '$attr.src'!"
 fi
 
+if [ "$oldVersion" != "$newVersion" ] && [ "$oldHash" = "$newHash" ]; then
+    mv "$nixFile.bak" "$nixFile"
+    die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!"
+fi
+
 sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|"
 if cmp -s "$nixFile" "$nixFile.bak"; then
     die "Failed to replace temporary source hash of '$attr' to the final source hash!"

From 47acd09fdb8e582d7dbb804d3661e65ce32d6c0a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 19 Nov 2017 03:36:03 +0200
Subject: [PATCH 112/122] update-source-version: Less strict regex for `name =
 ...` lines

---
 pkgs/common-updater/scripts/update-source-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 4c4cb56fb320..7a105b675227 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -44,8 +44,8 @@ oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
 
 if [ $(grep -c -E "^\s*(let\b)?\s*version\s+=\s+\"$oldVersion\"" "$nixFile") = 1 ]; then
     pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|"
-elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"$drvName-$oldVersion\"" "$nixFile") = 1 ]; then
-    pattern="/\bname\b\s*=/ s|\"$drvName-$oldVersion\"|\"$drvName-$newVersion\"|"
+elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"[^-]+-$oldVersion\"" "$nixFile") = 1 ]; then
+    pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|"
 else
     die "Couldn't figure out where out where to patch in new version in '$attr'!"
 fi

From ce421a7283d88b3c9d8f16c9d3e277f678fda15c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 11 Apr 2017 12:52:43 +0300
Subject: [PATCH 113/122] update-source-version: More robust scanning for the
 output hash

---
 pkgs/common-updater/scripts/update-source-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 7a105b675227..243358beb70b 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -74,7 +74,7 @@ fi
 if [ -z "$newHash" ]; then
     nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
     # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed
-    newHash=$(tail -n2 "$attr.fetchlog" | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | awk '{ print $(NF-4) }')
+    newHash=$(egrep -v "killing process|dependencies couldn't be built" "$attr.fetchlog" | tail -n2 | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | tr -d "'" | awk '{ print $(NF-4) }')
 fi
 
 if [ -z "$newHash" ]; then

From 022b0c9abc99f85cff1f9170ec04315406fb26d9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 9 Jun 2017 00:35:17 +0300
Subject: [PATCH 114/122] update-source-version: Don't require whitespace
 around equals sign

---
 pkgs/common-updater/scripts/update-source-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 243358beb70b..b383f7d131e9 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -42,9 +42,9 @@ fi
 # Escape regex metacharacter that are allowed in store path names
 oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
 
-if [ $(grep -c -E "^\s*(let\b)?\s*version\s+=\s+\"$oldVersion\"" "$nixFile") = 1 ]; then
+if [ $(grep -c -E "^\s*(let\b)?\s*version\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then
     pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|"
-elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"[^-]+-$oldVersion\"" "$nixFile") = 1 ]; then
+elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^-]+-$oldVersion\"" "$nixFile") = 1 ]; then
     pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|"
 else
     die "Couldn't figure out where out where to patch in new version in '$attr'!"

From 5ffbed75be4e2bd174c2dc293881116083e6567d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 6 Nov 2017 01:55:56 +0200
Subject: [PATCH 115/122] update-source-version: Name part of `name` can
 contain dashes

---
 pkgs/common-updater/scripts/update-source-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index b383f7d131e9..5922f3f30cf2 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -44,7 +44,7 @@ oldVersion=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g')
 
 if [ $(grep -c -E "^\s*(let\b)?\s*version\s*=\s*\"$oldVersion\"" "$nixFile") = 1 ]; then
     pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|"
-elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^-]+-$oldVersion\"" "$nixFile") = 1 ]; then
+elif [ $(grep -c -E "^\s*(let\b)?\s*name\s*=\s*\"[^\"]+-$oldVersion\"" "$nixFile") = 1 ]; then
     pattern="/\bname\b\s*=/ s|-$oldVersion\"|-$newVersion\"|"
 else
     die "Couldn't figure out where out where to patch in new version in '$attr'!"

From a86f1f1a0672c63750a79ee5a89af66b994b3146 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 26 Dec 2017 18:48:35 +0200
Subject: [PATCH 116/122] docutils: 0.13.1 -> 0.14

---
 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 2f0bbdd9dc73..49b113f499b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7905,11 +7905,11 @@ in {
 
   docutils = buildPythonPackage rec {
     name = "docutils-${version}";
-    version = "0.13.1";
+    version = "0.14";
 
     src = pkgs.fetchurl {
       url = "mirror://sourceforge/docutils/${name}.tar.gz";
-      sha256 = "1gkma47i609jfs7dssxn4y9vsz06qi0l5q41nws0zgkpnrghz33i";
+      sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
     };
 
     # error: invalid command 'test'

From 8ce44674958656f23932d3b189f6e7356772a9ca Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 26 Dec 2017 18:48:49 +0200
Subject: [PATCH 117/122] docutils: Install compat symlinks

E.g. latest upstream version of diffoscope depends on a command named
rst2man.
---
 pkgs/top-level/python-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49b113f499b7..fd15f3cc1569 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7915,6 +7915,13 @@ in {
     # error: invalid command 'test'
     doCheck = false;
 
+    # Create symlinks lacking a ".py" suffix, many programs depend on these names
+    postFixup = ''
+      (cd $out/bin && for f in *.py; do
+        ln -s $f $(echo $f | sed -e 's/\.py$//')
+      done)
+    '';
+
     meta = {
       description = "An open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX";
       homepage = http://docutils.sourceforge.net/;

From c47a1ba62a1bdcb3724b9cb1a2d9fbf2c684e03b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 26 Dec 2017 19:57:54 +0200
Subject: [PATCH 118/122] docutils: Enable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fd15f3cc1569..f425005c2fe3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7912,8 +7912,11 @@ in {
       sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
+    checkPhase = if isPy3k then ''
+      ${python.interpreter} test3/alltests.py
+    '' else ''
+      ${python.interpreter} test/alltests.py
+    '';
 
     # Create symlinks lacking a ".py" suffix, many programs depend on these names
     postFixup = ''

From d2724c13463a5a65d44092459b0650def2b8c4f4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 26 Dec 2017 18:55:48 +0200
Subject: [PATCH 119/122] sshfs-fuse: No need for rst2man.py patch anymore

---
 .../filesystems/sshfs-fuse/build-man-pages.patch      | 11 -----------
 pkgs/tools/filesystems/sshfs-fuse/default.nix         |  8 +++-----
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch

diff --git a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch b/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
deleted file mode 100644
index fba1d250c42b..000000000000
--- a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meson.build	2017-09-23 22:02:57.770555382 +0200
-+++ b/meson.build	2017-09-23 23:11:28.258095182 +0200
-@@ -25,7 +25,7 @@
- endif
- 
- 
--rst2man = find_program('rst2man', required: false)
-+rst2man = find_program('rst2man.py', required: true)
-   
- cfg = configuration_data()
- 
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index eebe3076c98a..6fd55c369d59 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3
-, buildManPages ? true, docutils
+, docutils
 }:
 
 let
@@ -15,10 +15,8 @@ in stdenv.mkDerivation rec {
     sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv";
   };
 
-  patches = optional buildManPages ./build-man-pages.patch;
-
-  nativeBuildInputs = [ meson pkgconfig ninja ];
-  buildInputs = [ fuse3 glib ] ++ optional buildManPages docutils;
+  nativeBuildInputs = [ meson pkgconfig ninja docutils ];
+  buildInputs = [ fuse3 glib ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optional
     (stdenv.system == "i686-linux")

From bf4cd1ee322661774c3608753805813e427e1874 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 26 Dec 2017 18:58:52 +0200
Subject: [PATCH 120/122] gitAndTools.gitRemoteGcrypt: No need for rst2man
 patch anymore

---
 .../git-and-tools/git-remote-gcrypt/default.nix            | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index ba2b71138067..1208afa19630 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -14,12 +14,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" ];
 
-  buildInputs = [ docutils makeWrapper ];
-
-  # The install.sh script expects rst2man, but here it's named rst2man.py
-  patchPhase = ''
-    sed -i 's/rst2man/rst2man.py/g' install.sh
-  '';
+  nativeBuildInputs = [ docutils makeWrapper ];
 
   installPhase = ''
     prefix="$out" ./install.sh

From b8556230fa7c4717e1e9432b10fcb1354f356621 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 26 Dec 2017 19:04:53 +0200
Subject: [PATCH 121/122] gitAndTools.hub: No need for rst2man.py patch anymore

---
 .../version-management/git-and-tools/git-hub/default.nix         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 4ec83af91607..f308073f1f1e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch = ''
-    substituteInPlace Makefile --replace rst2man rst2man.py
     patchShebangs .
   '';
 

From 4271a210b0ac9fbbea5382ddee1cfa835f3e35b9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 26 Dec 2017 19:07:58 +0200
Subject: [PATCH 122/122] zathura: No need for manual rst2man path anymore

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

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 8a460f890167..cf9230fa193e 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "PREFIX=$(out)"
-    "RSTTOMAN=${docutils}/bin/rst2man.py"
     "VERBOSE=1"
     "TPUT=${ncurses.out}/bin/tput"
     (optionalString synctexSupport "WITH_SYNCTEX=1")