From bbeecc708efc080acab7d10b912bd881d78673fa Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 31 Dec 2017 11:12:41 +0200
Subject: [PATCH 001/119] lvmsync: init at 3.3.2

---
 pkgs/tools/backup/lvmsync/Gemfile      |  2 ++
 pkgs/tools/backup/lvmsync/Gemfile.lock | 19 +++++++++++++
 pkgs/tools/backup/lvmsync/default.nix  | 37 ++++++++++++++++++++++++++
 pkgs/tools/backup/lvmsync/gemset.nix   | 36 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 5 files changed, 96 insertions(+)
 create mode 100644 pkgs/tools/backup/lvmsync/Gemfile
 create mode 100644 pkgs/tools/backup/lvmsync/Gemfile.lock
 create mode 100644 pkgs/tools/backup/lvmsync/default.nix
 create mode 100644 pkgs/tools/backup/lvmsync/gemset.nix

diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/pkgs/tools/backup/lvmsync/Gemfile
new file mode 100644
index 000000000000..a87462e2b8a2
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org/'
+gem 'lvmsync'
diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/tools/backup/lvmsync/Gemfile.lock
new file mode 100644
index 000000000000..1fe903f15088
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/Gemfile.lock
@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    git-version-bump (0.15.1)
+    lvmsync (3.3.2)
+      git-version-bump (~> 0.10)
+      treetop
+    polyglot (0.3.5)
+    treetop (1.6.9)
+      polyglot (~> 0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  lvmsync
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix
new file mode 100644
index 000000000000..dc589316a585
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, bundlerEnv, ruby, makeWrapper }:
+
+let
+
+  pname = "lvmsync";
+  version = (import ./gemset.nix)."${pname}".version;
+
+in stdenv.mkDerivation rec {
+
+  name = "${pname}-${version}";
+
+  env = bundlerEnv {
+    name = "${pname}-${version}-gems";
+    ruby = ruby;
+    gemfile  = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset   = ./gemset.nix;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = ["installPhase"];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/lvmsync $out/bin/lvmsync
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Optimised synchronisation of LVM snapshots over a network";
+    homepage = http://theshed.hezmatt.org/lvmsync/;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
+  };
+
+}
diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/tools/backup/lvmsync/gemset.nix
new file mode 100644
index 000000000000..7f80e928660b
--- /dev/null
+++ b/pkgs/tools/backup/lvmsync/gemset.nix
@@ -0,0 +1,36 @@
+{
+  git-version-bump = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xcj20gmbpqn2gcpid4pxpnimfdg2ip9jnl1572naz0magcrwl2s";
+      type = "gem";
+    };
+    version = "0.15.1";
+  };
+  lvmsync = {
+    dependencies = ["git-version-bump" "treetop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02mdrvfibvab4p4yrdzxvndhy8drss3ri7izybcwgpbyc7isk8mv";
+      type = "gem";
+    };
+    version = "3.3.2";
+  };
+  polyglot = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  treetop = {
+    dependencies = ["polyglot"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd";
+      type = "gem";
+    };
+    version = "1.6.9";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57c15125d2a3..bd27a82d721a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3008,6 +3008,8 @@ with pkgs;
 
   ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
 
+  lvmsync = callPackage ../tools/backup/lvmsync { };
+
   kippo = callPackage ../servers/kippo { };
 
   kzipmix = callPackage_i686 ../tools/compression/kzipmix { };

From c2b8d14b56f70b220b4c7c253036a3b3778a6780 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 17 Feb 2018 15:50:48 +0100
Subject: [PATCH 002/119] nixos/znapzend: fix when no previous zetup

When the znapzend module was enabled for the first time with pure =
true; then the list of previous entries is empty, but xargs still tried
to execute a znapzendzetup delete command with no arguments, which made
it fail
---
 nixos/modules/services/backup/znapzend.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 762bb4b38675..3d133f82d204 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -386,7 +386,7 @@ in
           echo Resetting znapzend zetups
           ${pkgs.znapzend}/bin/znapzendzetup list \
             | grep -oP '(?<=\*\*\* backup plan: ).*(?= \*\*\*)' \
-            | xargs ${pkgs.znapzend}/bin/znapzendzetup delete
+            | xargs -I{} ${pkgs.znapzend}/bin/znapzendzetup delete "{}"
         '' + concatStringsSep "\n" (mapAttrsToList (dataset: config: ''
           echo Importing znapzend zetup ${config} for dataset ${dataset}
           ${pkgs.znapzend}/bin/znapzendzetup import --write ${dataset} ${config}

From 2653355a9ca9a405fd07ae5ced363c97a322b170 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 1 Mar 2018 14:44:25 +0100
Subject: [PATCH 003/119] pgmanage: fix build

The configure script uses the `command` builtin command which is bash
specific while having a "#!/bin/sh" head.

This forces the use nix default shell (bash)

(cherry picked from commit 159a021bd83bc3e1bd385fe89522aea877eea29c)
---
 pkgs/applications/misc/pgmanage/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index e08035aef571..aa6555a89f2b 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw";
   };
 
+  patchPhase = ''
+    patchShebangs src/configure
+  '';
+
   buildInputs = [ postgresql openssl ];
 
   meta = with stdenv.lib; {

From 65b1c735de262d7d618a0fa03a12a6f0ef9e8bc3 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 7 Mar 2018 22:28:58 +0100
Subject: [PATCH 004/119] pgmanage: 10.1.0 -> 10.1.1

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

diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index aa6555a89f2b..7da71df7814c 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -2,19 +2,23 @@
 
 stdenv.mkDerivation rec {
   name = "pgmanage-${version}";
-  version = "10.1.0";
+  version = "10.1.1";
 
   src = fetchFromGitHub {
     owner  = "pgManage";
     repo   = "pgManage";
     rev    = "v${version}";
-    sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw";
+    sha256 = "1gv96an1ff9amh16lf71wknshmxl3l4hsl3ga7wb106c10i14zzc";
   };
 
   patchPhase = ''
     patchShebangs src/configure
   '';
 
+  configurePhase = ''
+    ./configure --prefix $out
+  '';
+
   buildInputs = [ postgresql openssl ];
 
   meta = with stdenv.lib; {

From a31b2ca00fae7db4f02ec0cace9f8774226c6c3a Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Wed, 14 Mar 2018 11:36:03 -0700
Subject: [PATCH 005/119] gnome2.zenity: Add docbook_xml_dtd_412 to prevent
 build from attempting to reference DTD from network and failing.

---
 pkgs/desktops/gnome-2/desktop/zenity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
index 55a5f9c0a234..014255785ddf 100644
--- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk
-, gnome-doc-utils, intltool, libglade, libX11, which }:
+, gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation {
   name = "zenity-2.32.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   configureFlags = "--disable-scrollkeeper";
-  buildInputs = [ gtk libglade libxml2 libxslt libX11 ];
+  buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ];
 
   nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ];
 }

From 4b625fd25ae90f8b23c418d0ca8948273a6f16f7 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Wed, 14 Mar 2018 12:07:45 -0700
Subject: [PATCH 006/119] gnome2.gnome-control-center: Add docbook_xml_dtd_412
 to prevent build from attempting to reference DTD from network and failing.

---
 .../gnome-2/desktop/gnome-control-center/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
index 7202be839082..276bc7e79c1a 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -3,7 +3,7 @@
 , glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
 , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon
 , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2
-, libSM }:
+, libSM, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation {
   name = "gnome-control-center-2.32.1";
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils
-                  gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 
+                  gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2
                   libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon
-                  libSM
+                  libSM docbook_xml_dtd_412
   ];
   configureFlags = "--disable-scrollkeeper";
 }

From 788ed0e618018955f50f61dcdc87774bf86a353d Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sat, 17 Mar 2018 18:19:50 +0100
Subject: [PATCH 007/119] snabb: 2016.04 -> 2018.01.2

---
 pkgs/tools/networking/snabb/default.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix
index 46580c0b802c..cdf14f5af33f 100644
--- a/pkgs/tools/networking/snabb/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }:
+{ stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools
+,supportOpenstack ? true
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "snabb-${version}";
-  version = "2016.04";
+  version = "2018.01.2";
 
   src = fetchFromGitHub {
     owner = "snabbco";
     repo = "snabb";
     rev = "v${version}";
-    sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx";
+    sha256 = "0n6bjf5g4imy0aql8fa55c0db3w8h944ia1dk10167x5pqvkgdgm";
   };
 
   buildInputs = [ makeWrapper ];
@@ -20,10 +24,14 @@ stdenv.mkDerivation rec {
     for f in $(find src/program/snabbnfv/ -type f); do
       substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash"
     done
-
+  '' + optionalString supportOpenstack ''
     # We need a way to pass $PATH to the scripts
-    sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
-    sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
+    sed -i '2iexport PATH=${git}/bin:${mysql}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
+    sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
+  '';
+
+  preBuild = ''
+    make clean
   '';
 
   installPhase = ''
@@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
   # "Fatal error: can't create obj/arch/sse2_c.o: No such file or directory".
   enableParallelBuilding = false;
 
-  meta = with stdenv.lib; {
+  meta =  {
     homepage = https://github.com/SnabbCo/snabbswitch;
     description = "Simple and fast packet networking toolkit";
     longDescription = ''

From f967d2340334416fce239af5f3d0aae1a94c6f1c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 11:10:10 -0500
Subject: [PATCH 008/119] erlang R18-20: updates

---
 pkgs/development/interpreters/erlang/R18.nix | 4 ++--
 pkgs/development/interpreters/erlang/R19.nix | 4 ++--
 pkgs/development/interpreters/erlang/R20.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index 967940ca184f..ee524feb4c6c 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -12,8 +12,8 @@ let
   };
 
 in mkDerivation rec {
-  version = "18.3.4.7";
-  sha256 = "1l66vzbb1vidrmf6gr84l34kgrpb9k7z2170bac4c6aviah9r02l";
+  version = "18.3.4.8";
+  sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g";
 
   patches = [
     rmAndPwdPatch
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index aa8c941eb93b..d0ba1912e9a4 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -1,8 +1,8 @@
 { mkDerivation, fetchurl, fetchpatch }:
 
 mkDerivation rec {
-  version = "19.3.6.4";
-  sha256 = "1w0h3wj2h58m3jrfgw56xab2352na3i9ccrbpfs4420dn7igf071";
+  version = "19.3.6.6";
+  sha256 = "05l81gig0hmr951pjvwknc9x2qvpm95ph9z072hn4jqg13rzbgvg";
 
   patches = [
     # macOS 10.13 crypto fix from OTP-20.1.2
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 8e955349f2d7..7757039a4a15 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,8 +1,8 @@
 { mkDerivation, fetchurl }:
 
 mkDerivation rec {
-  version = "20.2.2";
-  sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6";
+  version = "20.3.1";
+  sha256 = "13qh3an98qm477zr1dvcklbhar001cikp177295llcqpchamgzx3";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'

From db0a0d3d3a457d3e533bd3777449cfd49ce5b61f Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Fri, 23 Mar 2018 02:43:08 +0700
Subject: [PATCH 009/119] xpointerbarrier: 17.10 -> 17.11

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

diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix
index 93bbe1ce0bc5..50d0ac4f2b9a 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/pkgs/tools/X11/xpointerbarrier/default.nix
@@ -1,13 +1,13 @@
 { stdenv, xorg, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   name = "xpointerbarrier-${version}";
-  version = "17.10";
+  version = "17.11";
 
   src = fetchFromGitHub {
     owner = "vain";
     repo = "xpointerbarrier";
     rev = "v${version}";
-    sha256 = "0p4qc7ggndf74d2xdf38659prx3r3lfi5jc8nmqx52c9fqdshcrk";
+    sha256 = "0s6bd58xjyc2nqzjq6aglx6z64x9xavda3i6p8vrmxqmcpik54nm";
   };
 
   buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ];

From a6942651024e61ae0f636a532c70328fce7f6519 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 16:38:10 -0700
Subject: [PATCH 010/119] mediainfo: 17.12 -> 18.03

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/dykj39kcyb4rj6pm347q0djry1q5gh2y-mediainfo-18.03/bin/mediainfo -h` got 0 exit code
- ran `/nix/store/dykj39kcyb4rj6pm347q0djry1q5gh2y-mediainfo-18.03/bin/mediainfo --help` got 0 exit code
- directory tree listing: https://gist.github.com/f5a53e7a582604e5913226a02b977dc6
---
 pkgs/applications/misc/mediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 7b4b8f0d780b..18eb1800a7b1 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "17.12";
+  version = "18.03";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f";
+    sha256 = "171xv1qn6lbzybhx471j5a3rdqdj3xn0xc7gs181624r1kslxyn1";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 33fa93f4cac2573fc9b73f514aec03c6ec985655 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 17:03:25 -0700
Subject: [PATCH 011/119] mopidy-iris: 3.14.0 -> 3.14.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.14.2 with grep in /nix/store/anzim7y47xa3m530qzq91n9wl8ys1kk2-Mopidy-Iris-3.14.2
- directory tree listing: https://gist.github.com/96a0fc1d9812e5c4e6659fd37c7b21c6
---
 pkgs/applications/audio/mopidy-iris/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index cb99f9b5dbe5..4ba0088dd04d 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.14.0";
+  version = "3.14.2";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "2c0ec5138e554e91d299ac72a7049bc00d77770a08c16c17e1a9df7f8ef42feb";
+    sha256 = "19affzk45wby50gwxwzqgwa7h7618lcs48ngdsa06sd66s8x2fza";
   };
 
   propagatedBuildInputs = [

From 4f2d047c483d7dde5dd50a661c7d520e4f5ee8fe Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 20:49:27 -0700
Subject: [PATCH 012/119] rawtherapee: 5.3 -> 5.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.4 with grep in /nix/store/p24xccx2wm6dls7g36pzdl1m1r3p1x5l-rawtherapee-5.4
- directory tree listing: https://gist.github.com/ea61efad6dd7afad2c60614dd433534d
---
 pkgs/applications/graphics/rawtherapee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 9964bec67814..eb97a2b9b3b6 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.3";
+  version = "5.4";
   name = "rawtherapee-" + version;
 
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
     rev = version;
-    sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7";
+    sha256 = "1h2x5biqsb4kfwsffqkyk8ky22qv2a0cjs1s445x9farcr3kwk99";
   };
 
   nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];

From 7681bf4e914588e741ddeaea42b6ac9a934e670e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 21:41:26 -0700
Subject: [PATCH 013/119] snd: 18.1 -> 18.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/snd/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/caxkfgbcv6kplihpx8gbivz6l5sisnv5-snd-18.2/bin/snd --help` got 0 exit code
- ran `/nix/store/caxkfgbcv6kplihpx8gbivz6l5sisnv5-snd-18.2/bin/snd --version` and found version 18.2
- ran `/nix/store/caxkfgbcv6kplihpx8gbivz6l5sisnv5-snd-18.2/bin/snd --help` and found version 18.2
- found 18.2 with grep in /nix/store/caxkfgbcv6kplihpx8gbivz6l5sisnv5-snd-18.2
- directory tree listing: https://gist.github.com/549e1eef8a929e09d72499dc97a47aa2
---
 pkgs/applications/audio/snd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 3fe8ecfe5468..660f342dc9d9 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-18.1";
+  name = "snd-18.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "0wdifvpm54j5fxxp867jnrfdy3jb8iff2mxqvp08plp45zfjv6xh";
+    sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a252f83fdbc548fe2dfe67e258ea2ea0cb58af07 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 22:36:20 -0700
Subject: [PATCH 014/119] swiften: 3.0beta2 -> 4.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/swiften/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0/bin/swiften-config -h` got 0 exit code
- ran `/nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0/bin/swiften-config --help` got 0 exit code
- ran `/nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0/bin/swiften-config help` got 0 exit code
- ran `/nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0/bin/swiften-config --version` and found version 4.0
- found 4.0 with grep in /nix/store/pfiq18ki0dzdd0zsbvv04sppr4f28fl5-swiften-4.0
- directory tree listing: https://gist.github.com/bf18dc85d27b684315737f90db4a6b64
---
 pkgs/development/libraries/swiften/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index e6fb5a2b6853..272967fcb996 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,14 +1,14 @@
 { stdenv, python, fetchurl, openssl, boost }:
 stdenv.mkDerivation rec {
   name    = "swiften-${version}";
-  version = "3.0beta2";
+  version = "4.0";
 
   buildInputs           = [ python ];
   propagatedBuildInputs = [ openssl boost ];
 
   src = fetchurl {
     url    = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
-    sha256 = "0i6ks122rry9wvg6qahk3yiggi7nlkpgws1z0r41vi4i1siq0ls0";
+    sha256 = "06bk45hxqmny8z7x78ycrfrazq6xdzv5c28i8x0lgc85j03b5dsh";
   };
   
   buildPhase = ''

From abc0bf28bed3902fca9447586a86353fad19c7d3 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 23 Mar 2018 16:30:53 +0100
Subject: [PATCH 015/119] telepathy-gabble: fix source URL

upstream changed it
---
 .../networking/instant-messengers/telepathy/gabble/default.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 1b9ccb98d0fa..40de405e0d2e 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "telepathy-gabble-0.18.3";
 
   src = fetchurl {
-    url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
+    url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
     sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
   };
 

From b072dcffaeba82364aa8bff7c8db63d47876deec Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 23 Mar 2018 17:37:30 -0400
Subject: [PATCH 016/119] docker: 18.02 -> 18.03

---
 .../virtualization/docker/default.nix         | 30 ++++++-------------
 pkgs/top-level/all-packages.nix               |  7 ++---
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index af15240dc12e..1616e176424a 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -195,28 +195,16 @@ rec {
   });
 
   # Get revisions from
-  # https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
+  # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
 
-  docker_17_12 = dockerGen rec {
-    version = "17.12.1-ce";
-    rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit
-    sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i";
-    runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
-    runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
-    containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
-    containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
-    tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
-    tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
-  };
-
-  docker_18_02 = dockerGen rec {
-    version = "18.02.0-ce";
-    rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit
-    sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m";
-    runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
-    runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
-    containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
-    containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
+  docker_18_03 = dockerGen rec {
+    version = "18.03.0-ce";
+    rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit
+    sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g";
+    runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
+    runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
+    containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c";
+    containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0";
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b35ca3eeaea..a1197bdffc9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15133,11 +15133,10 @@ with pkgs;
 
   # go 1.9 pin until https://github.com/moby/moby/pull/35739
   inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
-    docker_17_12
-    docker_18_02;
+    docker_18_03;
 
-  docker = docker_17_12;
-  docker-edge = docker_18_02;
+  docker = docker_18_03;
+  docker-edge = docker_18_03;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 

From 8f0c697adf250a26c572710f0c6bf24f350b6aef Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 24 Mar 2018 09:35:49 +0000
Subject: [PATCH 017/119] krita: fix incorrect sha256

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

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index f74ad3c877ca..6eaa4727e811 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -13,7 +13,7 @@ mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "14sm67vkpxzpnh4c2mzvr0rpk8a3i8kzxx6fi3lpczrcc1g7di09";
+    sha256 = "0dh3bm90mxrbyvdp7x7hcf5li48j7ppkb44lls65lpn6c59r5waz";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From f59a544bf1db7141c9686bc65edc201582388d37 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 24 Mar 2018 14:02:04 +0100
Subject: [PATCH 018/119] jsduck: fix build

json 1.8.3 is broken with ruby 2.4
---
 pkgs/development/tools/jsduck/Gemfile.lock | 2 +-
 pkgs/development/tools/jsduck/gemset.nix   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock
index d3e1556a7b39..2a95d72c9465 100644
--- a/pkgs/development/tools/jsduck/Gemfile.lock
+++ b/pkgs/development/tools/jsduck/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
       parallel (~> 0.7.1)
       rdiscount (~> 2.1.6)
       rkelly-remix (~> 0.0.4)
-    json (1.8.3)
+    json (1.8.6)
     parallel (0.7.1)
     rdiscount (2.1.8)
     rkelly-remix (0.0.7)
diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/development/tools/jsduck/gemset.nix
index d80bd70dd728..493cc42f4f4e 100644
--- a/pkgs/development/tools/jsduck/gemset.nix
+++ b/pkgs/development/tools/jsduck/gemset.nix
@@ -19,10 +19,10 @@
   json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
       type = "gem";
     };
-    version = "1.8.3";
+    version = "1.8.6";
   };
   parallel = {
     source = {
@@ -48,4 +48,4 @@
     };
     version = "0.0.7";
   };
-}
\ No newline at end of file
+}

From b5b77a688683441a36edf18df2278fba160e17e0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 24 Mar 2018 14:26:30 +0100
Subject: [PATCH 019/119] qscreenshot: fix darwin build

/cc ZHF #36454
---
 pkgs/applications/graphics/qscreenshot/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix
index c4f4f6472ed6..fafc76a76ffe 100644
--- a/pkgs/applications/graphics/qscreenshot/default.nix
+++ b/pkgs/applications/graphics/qscreenshot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dos2unix, which, qt }:
+{ stdenv, fetchurl, dos2unix, which, qt, Carbon }:
 
 stdenv.mkDerivation rec {
   name = "qscreenshot-1.0";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx";
   };
 
-  buildInputs = [ dos2unix which qt ];
+  buildInputs = [ dos2unix which qt ]
+    ++ stdenv.lib.optional stdenv.isDarwin Carbon;
 
   # Remove carriage returns that cause /bin/sh to abort
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96d3ecee2c78..a515c543a91d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17310,6 +17310,7 @@ with pkgs;
   qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
 
   qscreenshot = callPackage ../applications/graphics/qscreenshot {
+    inherit (darwin.apple_sdk.frameworks) Carbon;
     qt = qt4;
   };
 

From 99f2b33519e4e02f155f182f0a99183b262d931b Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 23 Mar 2018 11:57:59 +0100
Subject: [PATCH 020/119] CODEOWNERS: Add Profpatsch to /lib/generators.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I’d like to be notified of changes so I can ensure the API always follows the same patterns.

Later (more specific) files replace more general codeowners [according to the documentation](https://help.github.com/articles/about-codeowners/), so I also listed `edolstra` and `nbp` again.
---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dde31a2c0c01..01a24d64988c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,6 +13,7 @@
 # Libraries
 /lib                        @edolstra @nbp
 /lib/systems                @nbp @ericson2314
+/lib/generators.nix         @edolstra @nbp @Profpatsch
 
 # Nixpkgs Internals
 /default.nix                          @nbp

From 50dc85ed6283bb17684597cbf95f9405d5637fea Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 24 Mar 2018 16:07:50 +0200
Subject: [PATCH 021/119] U-Boot: Disable parallel build

https://hydra.nixos.org/build/71880710
---
 pkgs/misc/uboot/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 807bc48a6428..4cf1748bad44 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -78,7 +78,9 @@ let
       runHook postInstall
     '';
 
-    enableParallelBuilding = true;
+    # make[2]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'.  Stop.
+    enableParallelBuilding = false;
+
     dontStrip = true;
 
     meta = with stdenv.lib; {

From 3131daace1eed2b642ab56c5843fd2057fbbfde3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 23 Mar 2018 19:27:31 +0200
Subject: [PATCH 022/119] nixos/tests/installer: Give eval failure on
 unsupported boot methods

---
 nixos/tests/installer.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index f67011b4412c..acf248d0a5a6 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -80,8 +80,9 @@ let
         + optionalString isEfi (if pkgs.stdenv.isAarch64
             then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", ''
             else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '');
-    in
-    ''
+    in if !isEfi && !(pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
+      throw "Non-EFI boot methods are only supported on i686 / x86_64"
+    else ''
       $machine->start;
 
       # Make sure that we get a login prompt etc.

From a6425fc66dbbcdd8dc23c8c721e15d6ed6126325 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 24 Mar 2018 16:10:22 +0200
Subject: [PATCH 023/119] ghc: Disable on AArch64

For some reason compiling the proper GHC from the binary one eventually
segfaults at some point.

Since it has never worked, just disable it and investigate later.
---
 pkgs/development/compilers/ghc/8.2.1-binary.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix
index 8a08ab4b9862..5cb3f2ea5ced 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix
@@ -158,5 +158,6 @@ stdenv.mkDerivation rec {
   passthru = { targetPrefix = ""; };
 
   meta.license = stdenv.lib.licenses.bsd3;
-  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
+  # AArch64 should work in theory but eventually some builds start segfaulting
+  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */];
 }

From 8df9cf585aa48e408837102d072bac71b3acbee4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 24 Mar 2018 17:08:21 +0100
Subject: [PATCH 024/119] browserpass: 2.0.13 -> 2.0.17

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

diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index c6d4a78e6b4b..1e6e9e788d78 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "browserpass-${version}";
-  version = "2.0.13";
+  version = "2.0.17";
 
   goPackagePath = "github.com/dannyvankooten/browserpass";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     repo = "browserpass";
     owner = "dannyvankooten";
     rev = version;
-    sha256 = "0pch0jddphgaaw208ddqjhnkiy5916n0kjxfza1cpc78fa8zw82l";
+    sha256 = "1gbhpx75bcacj6z5p4av0011c4chhzqcjjs2bvmfxpi7826hn9kn";
   };
 
   postInstall = ''

From 204a029101b028e479cdbd4e12fa4f74c1155ae5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 24 Mar 2018 17:09:55 +0100
Subject: [PATCH 025/119] openra: 20180218 -> 20180307

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

diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index c6aedcd172e3..069ed900e8f0 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   name = "openra-${version}";
-  version = "20180218";
+  version = "20180307";
 
   meta = with stdenv.lib; {
     description = "Real Time Strategy game engine recreating the C&C titles";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "OpenRA";
     repo = "OpenRA";
     rev = "release-${version}";
-    sha256 = "1853p2q88602s3zf22wg1h2qx2x661n20bcjjbfmj0h2d4p9dmaf";
+    sha256 = "05c6vrmlgzfxgfx1idqmp6czmr079px3n57q5ahnwzqvcl11a2jj";
 
     extraPostFetch = ''
       sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh

From 527e97f333a8b6240242a1ae269d86101e4eca45 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sat, 24 Mar 2018 17:43:32 +0100
Subject: [PATCH 026/119] acme module: update for simp_le v0.8

Hopefully fixes #37689
---
 nixos/modules/security/acme.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 0736239ed2cf..e9676d9dfb15 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -140,14 +140,6 @@ in
         '';
       };
 
-      tosHash = mkOption {
-        type = types.string;
-        default = "cc88d8d9517f490191401e7b54e9ffd12a2b9082ec7a1d4cec6101f9f1647e7b";
-        description = ''
-          SHA256 of the Terms of Services document. This changes once in a while.
-        '';
-      };
-
       production = mkOption {
         type = types.bool;
         default = true;
@@ -196,7 +188,7 @@ in
               let
                 cpath = "${cfg.directory}/${cert}";
                 rights = if data.allowKeysForGroup then "750" else "700";
-                cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ]
+                cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
                           ++ optionals (data.email != null) [ "--email" data.email ]
                           ++ concatMap (p: [ "-f" p ]) data.plugins
                           ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)

From 285ef9be090dbe5779e0439d2dfa949a5a829acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sat, 24 Mar 2018 17:58:06 +0100
Subject: [PATCH 027/119] libcdio-paranoia: fix darwin build

---
 .../libraries/libcdio-paranoia/default.nix           | 12 ++++++++++--
 pkgs/top-level/all-packages.nix                      |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix
index b3aa2b199060..48e632ba52d8 100644
--- a/pkgs/development/libraries/libcdio-paranoia/default.nix
+++ b/pkgs/development/libraries/libcdio-paranoia/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libcdio, pkgconfig,
+  libiconv, IOKit, DiskArbitration}:
 
 stdenv.mkDerivation {
   name = "libcdio-paranoia-0.94+2";
@@ -11,7 +12,14 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ libcdio ];
+  buildInputs = [ libcdio ] ++
+    stdenv.lib.optionals stdenv.isDarwin [ libiconv IOKit DiskArbitration ];
+
+  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin DiskArbitration;
+
+  configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+    "--disable-ld-version-script"
+  ];
 
   meta = with stdenv.lib; {
     description = "CD paranoia on top of libcdio";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a515c543a91d..6d31e7b2fc7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9601,7 +9601,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
   };
 
-  libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia { };
+  libcdio-paranoia = callPackage ../development/libraries/libcdio-paranoia {
+    inherit (darwin.apple_sdk.frameworks) DiskArbitration IOKit;
+  };
 
   libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
 

From 64c756d50d5d838a6b5cdcec73b8ef090048aeb1 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 24 Mar 2018 17:23:55 +0000
Subject: [PATCH 028/119] babelstone-han: 10.0.2 -> 11.0.0

new font version; old link answers with 404
---
 pkgs/data/fonts/babelstone-han/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
index b33295f89b2c..acfcc9181045 100644
--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -1,16 +1,16 @@
 {stdenv, fetchzip}:
 
 let
-  version = "10.0.2";
+  version = "11.0.0";
 in fetchzip {
   name = "babelstone-han-${version}";
 
-  url = http://www.babelstone.co.uk/Fonts/7932/BabelStoneHan.zip;
+  url = http://www.babelstone.co.uk/Fonts/3902/BabelStoneHan.zip;
   postFetch = ''
     mkdir -p $out/share/fonts/truetype
     unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
   '';
-  sha256 = "17r5cf028v66yzjf9qbncn4rchv2xxkl2adxr35ppg1l7zssz9v6";
+  sha256 = "1w3v69lacsy0nha20rkbs6f0dskf5xm6p250qx4a1m69d4a1gx7v";
 
   meta = with stdenv.lib; {
     description = "Unicode CJK font with over 32600 Han characters";

From ad3eb5d8fc6233eb2e71440d6b0fa412890d5c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sat, 24 Mar 2018 19:04:56 +0100
Subject: [PATCH 029/119] glyr: enable darwin build

---
 pkgs/tools/audio/glyr/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix
index e98667b8c04a..23a33122c9fb 100644
--- a/pkgs/tools/audio/glyr/default.nix
+++ b/pkgs/tools/audio/glyr/default.nix
@@ -15,16 +15,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ sqlite glib curl ];
 
-  configurePhase = ''
-    cmake -DCMAKE_INSTALL_PREFIX=$out
-  '';
-
   meta = with stdenv.lib; {
     license = licenses.lgpl3;
     description = "A music related metadata searchengine";
     homepage = https://github.com/sahib/glyr;
     maintainers = [ maintainers.sternenseemann ];
-    platforms = platforms.linux; # TODO macOS would be possible
+    platforms = platforms.unix;
   };
 }
 

From 46419cab7e7ff58a9a2b9aa18fef8a499af39295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 24 Mar 2018 19:25:18 +0100
Subject: [PATCH 030/119] pythonPackages.fonttools: 3.24.0 -> 3.24.1

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

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index d7e789b02fa3..fdfa4e530cf9 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.24.0";
+  version = "3.24.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d09126f443bc8797d1b7e76274e65f4c169c04722745953ecf536451b1d9a15f";
+    sha256 = "d13e98c9f3b635a5334dab69eb471d7286928ac82db7ca57b5bf4cdf3824789a";
     extension = "zip";
   };
 

From 5adec8d6c18fb24d002bf055ac3e0805146f4caa Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 24 Mar 2018 19:34:46 +0100
Subject: [PATCH 031/119] autossh: 1.4e -> 1.4f

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

diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix
index 9ff0376c8bcf..452837ef2e4f 100644
--- a/pkgs/tools/networking/autossh/default.nix
+++ b/pkgs/tools/networking/autossh/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssh}:
 
 stdenv.mkDerivation rec {
-  name = "autossh-1.4e";
+  name = "autossh-1.4f";
   
   src = fetchurl {
     url = "http://www.harding.motd.ca/autossh/${name}.tgz";
-    sha256 = "0mlicw28vq2jxa0jf0dys5ja75v0fxpjavlq9dpif6bnknji13ly";
+    sha256 = "1wpqwa2872nqgqbhnb6nnkrlzpdawd5k69gh1qp68354pvhyawh1";
   };
   
   buildInputs = [ openssh ];

From c71bcb2744c4a78dccf96716789602e3c41a0fac Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 24 Mar 2018 19:36:06 +0100
Subject: [PATCH 032/119] grpcio: use protobuf3_5

---
 pkgs/development/python-modules/google_api_core/default.nix | 4 ++--
 .../python-modules/google_cloud_speech/default.nix          | 5 ++---
 pkgs/development/python-modules/google_gax/default.nix      | 5 +++--
 .../python-modules/googleapis_common_protos/default.nix     | 4 ++--
 pkgs/development/python-modules/grpcio/default.nix          | 4 ++--
 pkgs/top-level/python-packages.nix                          | 6 ++++++
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index 2899eeb4a8af..df148b1ede34 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, google_auth, protobuf, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }:
+, google_auth, protobuf3_5, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }:
 
 buildPythonPackage rec {
   pname = "google-api-core";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "0144d467083ed54d2e8ccb4212d42c3724fe0b844b7d3a0ff85aea54b7ae8347";
   };
 
-  propagatedBuildInputs = [ google_auth protobuf googleapis_common_protos requests grpcio ];
+  propagatedBuildInputs = [ google_auth protobuf3_5 googleapis_common_protos requests grpcio ];
   checkInputs = [ setuptools mock pytest ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix
index 9912316941f9..75c14ff62ebc 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_speech/default.nix
@@ -13,9 +13,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ];
   checkInputs = [ pytest mock ];
 
-  checkPhase = ''
-    py.test
-  '';
+  # needs credentials
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Cloud Speech API enables integration of Google speech recognition into applications.";
diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix
index 24000161338c..a8ac37e7e8cd 100644
--- a/pkgs/development/python-modules/google_gax/default.nix
+++ b/pkgs/development/python-modules/google_gax/default.nix
@@ -1,5 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi
-, google_auth, ply, protobuf, grpcio, requests, googleapis_common_protos,  dill,  future,  pytest,  mock,  unittest2 }:
+, google_auth, ply, protobuf3_5, grpcio, requests
+, googleapis_common_protos, dill, future, pytest, mock, unittest2 }:
 
 buildPythonPackage rec {
   pname = "google-gax";
@@ -10,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "0p1ribd2xy7a04wnjv12agkcdi6f9cpj838884hayx07p5g8v3ji";
   };
 
-  propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ];
+  propagatedBuildInputs = [ google_auth ply protobuf3_5 grpcio requests googleapis_common_protos dill future ];
   checkInputs = [ pytest mock unittest2 ];
 
   # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where
diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix
index 28e84f4846e7..7427e590c0ca 100644
--- a/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, protobuf, pytest }:
+, protobuf3_5, pytest }:
 
 buildPythonPackage rec {
   pname = "googleapis-common-protos";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0";
   };
 
-  propagatedBuildInputs = [ protobuf ];
+  propagatedBuildInputs = [ protobuf3_5 ];
   checkInputs = [ pytest ];
 
   doCheck = false;  # there are no tests
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index d1f0903238c7..47e9d179eea7 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, lib
-, six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }:
+, six, protobuf3_5, enum34, futures, isPy26, isPy27, isPy34 }:
 
 buildPythonPackage rec {
   pname = "grpcio";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d";
   };
 
-  propagatedBuildInputs = [ six protobuf ]
+  propagatedBuildInputs = [ six protobuf3_5 ]
                         ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ]
                         ++ lib.optionals (isPy26 || isPy27) [ futures ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca4a13b86dfd..e11a541a2515 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12151,6 +12151,12 @@ in {
     protobuf = pkgs.protobuf3_1;
   };
 
+  protobuf3_5 = callPackage ../development/python-modules/protobuf {
+    disabled = isPyPy;
+    doCheck = !isPy3k;
+    protobuf = pkgs.protobuf3_5;
+  };
+
   psd-tools = callPackage ../development/python-modules/psd-tools { };
 
   psutil = callPackage ../development/python-modules/psutil { };

From 8ac272f98d7d32594f38e7824b8c630e40663736 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jonathan.banafato@gmail.com>
Date: Sat, 24 Mar 2018 15:28:13 -0400
Subject: [PATCH 033/119] keybase-gui: Enable desktop notifications (#37711)

Add `libnotify` as a build input to make message notifications work.
---
 pkgs/tools/security/keybase-gui/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix
index 53b871306d7e..1d50f5498c83 100644
--- a/pkgs/tools/security/keybase-gui/default.nix
+++ b/pkgs/tools/security/keybase-gui/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
-, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr
-, nss, pango, systemd, xorg, utillinuxMinimal }:
+, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2
+, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
@@ -17,6 +17,7 @@ let
     glib
     gnome2.GConf
     gtk2
+    libnotify
     nspr
     nss
     pango

From 46a90e3273d6ff03c5b9492b778b2bf75f31abfa Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sun, 18 Mar 2018 12:40:14 +0000
Subject: [PATCH 034/119] clipper: init at 6.4.2

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

diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix
new file mode 100644
index 000000000000..31af37587821
--- /dev/null
+++ b/pkgs/development/libraries/clipper/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, ninja, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "6.4.2";
+  name = "Clipper-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/polyclipping/clipper_ver${version}.zip";
+    sha256 = "09q6jc5k7p9y5d75qr2na5d1gm0wly5cjnffh127r04l47c20hx1";
+  };
+
+  sourceRoot = "cpp";
+
+  buildInputs = [ ];
+
+  nativeBuildInputs = [ cmake ninja unzip ];
+
+  meta = with stdenv.lib; {
+    longDescription = ''
+      The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or,
+      and line & polygon offsetting. The library is based on Vatti's clipping algorithm.
+    '';
+    homepage = https://www.angusj.com/delphi/clipper.php;
+    license = licenses.boost;
+    maintainers = with maintainers; [ mpickering ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f29919ab6ba2..33c492cd94f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8524,6 +8524,8 @@ with pkgs;
 
   clearsilver = callPackage ../development/libraries/clearsilver { };
 
+  clipper = callPackage ../development/libraries/clipper { };
+
   cln = callPackage ../development/libraries/cln { };
 
   clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };

From 1e0a60b738064b9bad6fc36e4d939fff8eb7033f Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sun, 18 Mar 2018 12:41:14 +0000
Subject: [PATCH 035/119] open-orienteering-mapper: init at 0.8.1

---
 .../gis/openorienteering-mapper/default.nix   | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/applications/gis/openorienteering-mapper/default.nix

diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
new file mode 100644
index 000000000000..6eb7fba646cb
--- /dev/null
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchFromGitHub, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools
+  , qtlocation, qtsensors, doxygen, cups, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  name = "OpenOrienteering-Mapper-${version}";
+  version = "0.8.1";
+
+  buildInputs = [ gdal qtbase qttools qtlocation qtsensors clipper zlib proj doxygen cups];
+
+  nativeBuildInputs = [ cmake makeWrapper ninja ];
+
+  src = fetchFromGitHub {
+    owner = "OpenOrienteering";
+    repo = "mapper";
+    rev = "v${version}";
+    sha256 = "10viw8bddl76mc2gh84jsl7h237yzvh4nim61pbd63vg1hlqisi6";
+  };
+
+  cmakeFlags =
+    [
+    # Required by the build to be specified
+    "-DPROJ4_ROOT=${proj}"
+
+    # Building the manual and bundling licenses fails
+    "-DLICENSING_PROVIDER:BOOL=OFF"
+    "-DMapper_MANUAL_QTHELP:BOOL=OFF"
+    ] ++
+    (stdenv.lib.optionals stdenv.isDarwin
+    [
+    # Usually enabled on Darwin
+    "-DCMAKE_FIND_FRAMEWORK=never"
+    # FindGDAL is broken and always finds /Library/Framework unless this is
+    # specified
+    "-DGDAL_INCLUDE_DIR=${gdal}/include"
+    "-DGDAL_CONFIG=${gdal}/bin/gdal-config"
+    "-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"
+    # Don't bundle libraries
+    "-DMapper_PACKAGE_PROJ=0"
+    "-DMapper_PACKAGE_QT=0"
+    "-DMapper_PACKAGE_ASSISTANT=0"
+    "-DMapper_PACKAGE_GDAL=0"
+    ]);
+
+
+  postInstall =
+    stdenv.lib.optionalString stdenv.isDarwin ''
+    # Fixes "This application failed to start because it could not find or load the Qt
+    # platform plugin "cocoa"."
+    wrapProgram $out/Mapper.app/Contents/MacOS/Mapper \
+      --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms
+    mkdir -p $out/bin
+    ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper
+    '';
+
+  meta = {
+    description = ''
+      OpenOrienteering Mapper is an orienteering mapmaking program
+      and provides a free alternative to the existing proprietary solution.
+    '';
+    homepage = https://www.openorienteering.org/apps/mapper/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = with stdenv.lib.platforms; darwin;
+    maintainers = with stdenv.lib.maintainers; [mpickering];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33c492cd94f0..7c5bc5fd2804 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17036,6 +17036,8 @@ with pkgs;
 
   openjump = callPackage ../applications/misc/openjump { };
 
+  openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
+
   openscad = callPackage ../applications/graphics/openscad {};
 
   opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};

From a76a8cc59434e8906806330ca0615efa1a385378 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 24 Mar 2018 20:55:31 +0100
Subject: [PATCH 036/119] minio: 2018-02-09T22-40-05Z -> 2018-03-19T19-22-06Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index ea77b32a8666..90a959872673 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-${version}";
 
-  version = "2018-02-09T22-40-05Z";
+  version = "2018-03-19T19-22-06Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "0qxrzmkm5hza5xbx9dkrgadwjg3hykwf79hix3s0laqyksmpj9mk";
+    sha256 = "0cqvam7i8caqlb0jdn89s1k18gfy4yndsszj7d81qg2sns0p5zgm";
   };
 
   goPackagePath = "github.com/minio/minio";

From a60c4b56f767eda0ccafc53110528e586ccc57dc Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 24 Mar 2018 21:50:23 +0100
Subject: [PATCH 037/119] translate-shell: 0.9.6.6 -> 0.9.6.7, fix packaging

---
 .../misc/translate-shell/default.nix          | 99 ++++---------------
 1 file changed, 18 insertions(+), 81 deletions(-)

diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix
index 3810da40849b..8e8a22ed4e41 100644
--- a/pkgs/applications/misc/translate-shell/default.nix
+++ b/pkgs/applications/misc/translate-shell/default.nix
@@ -1,101 +1,38 @@
-{ stdenv, fetchFromGitHub, curl, fribidi, mpv, less, rlwrap, gawk, bash, emacs, groff, ncurses, pandoc }:
+{ stdenv, fetchFromGitHub, makeWrapper, curl, fribidi, rlwrap, gawk, groff, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "translate-shell";
-  version = "0.9.6.6";
+  version = "0.9.6.7";
 
   src = fetchFromGitHub {
     owner = "soimort";
     repo = "translate-shell";
-    rev = "v" + version;
-    sha256 = "0hbwvc554v6fi4ardidwsnn8hk7p68p155yjllvljjawkbq4qljq";
+    rev = "v${version}";
+    sha256 = "0krcidjh32xwybr1v4nykgf0jjnffjqx125bvn3jh2a44cikyq3n";
   };
 
-  phases = [ "buildPhase" "installPhase" "postFixup" ];
+  buildInputs = [ makeWrapper ];
 
-  buildPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share
-    mkdir -p $out/share/man/man1
-  '';
-
-  installPhase = ''
-    cp $src/translate $out/bin/trans
-    cp $src/translate $out/bin/translate
-    cp $src/translate $out/bin/translate-shell
-
-    cp $src/translate.awk $out/share/translate.awk
-    cp $src/build.awk $out/share/build.awk
-    cp $src/metainfo.awk $out/share/metainfo.awk
-    cp $src/test.awk $out/share/test.awk
-
-    cp -r $src/include $out/share
-    cp -r $src/test $out/share
-    cp $src/man/trans.1 $out/share/man/man1
-
-    chmod +x $out/bin/translate
-    chmod +x $out/share/translate.awk
-    chmod +x $out/share/build.awk
-    chmod +x $out/share/metainfo.awk
-    chmod +x $out/share/test.awk
-  '';
-
-  postFixup = ''
-    substituteInPlace $out/bin/trans --replace "/bin/sh" "${bash}/bin/bash"
-    substituteInPlace $out/bin/trans --replace "gawk " "${gawk}/bin/gawk "
-    substituteInPlace $out/bin/trans --replace "translate.awk" "$out/share/translate.awk"
-
-    substituteInPlace $out/bin/translate --replace "/bin/sh" "${bash}/bin/bash"
-    substituteInPlace $out/bin/translate --replace "gawk " "${gawk}/bin/gawk "
-    substituteInPlace $out/bin/translate --replace "translate.awk" "$out/share/translate.awk"
-
-    substituteInPlace $out/bin/translate-shell --replace "/bin/sh" "${bash}/bin/bash"
-    substituteInPlace $out/bin/translate-shell --replace "gawk " "${gawk}/bin/gawk "
-    substituteInPlace $out/bin/translate-shell --replace "translate.awk" "$out/share/translate.awk"
-
-    substituteInPlace $out/share/translate.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk"
-    substituteInPlace $out/share/translate.awk --replace "metainfo" "$out/share/metainfo"
-    substituteInPlace $out/share/translate.awk --replace "include/" "$out/share/include/"
-
-    substituteInPlace $out/share/build.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk"
-    substituteInPlace $out/share/build.awk --replace "include/" "$out/share/include/"
-    substituteInPlace $out/share/build.awk --replace "metainfo.awk" "$out/share/metainfo.awk"
-
-    substituteInPlace $out/share/metainfo.awk --replace "translate.awk" "$out/share/translate.awk"
-
-    substituteInPlace $out/share/test.awk --replace "/usr/bin/gawk" "${gawk}/bin/gawk"
-    substituteInPlace $out/share/test.awk --replace "include/" "$out/share/include/"
-    substituteInPlace $out/share/test.awk --replace "test/" "$out/share/test/"
-
-    substituteInPlace $out/share/include/Translators/\*.awk --replace "include/" "$out/share/include/"
-
-    substituteInPlace $out/share/test/Test.awk --replace "test/" "$out/share/test/"
-    substituteInPlace $out/share/test/TestUtils.awk --replace "include/" "$out/share/include/"
-    substituteInPlace $out/share/test/TestParser.awk --replace "include/" "$out/share/include/"
-    substituteInPlace $out/share/test/TestCommons.awk --replace "\"gawk\"" "\"${gawk}/bin/gawk\""
-    substituteInPlace $out/share/test/TestCommons.awk --replace "Commons.awk" "$out/share/include/Commons.awk"
-
-    substituteInPlace $out/share/include/Main.awk --replace "\"tput\"" "\"${ncurses.out}/bin/tput\""
-    substituteInPlace $out/share/include/Help.awk --replace "\"groff\"" "\"${groff}/bin/groff\""
-    substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi\"" "\"${fribidi}/bin/fribidi\""
-    substituteInPlace $out/share/include/Utils.awk --replace "\"fribidi " "\"${fribidi}/bin/fribidi "
-    substituteInPlace $out/share/include/Utils.awk --replace "\"rlwrap\"" "\"${rlwrap}/bin/rlwrap\""
-    substituteInPlace $out/share/include/Utils.awk --replace "\"emacs\"" "\"${emacs}/bin/emacs\""
-    substituteInPlace $out/share/include/Utils.awk --replace "\"curl\"" "\"${curl.bin}/bin/curl\""
-
-    substituteInPlace $out/share/build.awk --replace "\"pandoc " "\"${pandoc}/bin/pandoc "
-
-    substituteInPlace $out/share/include/Translate.awk --replace "\"mpv " "\"${mpv}/bin/mpv "
-    substituteInPlace $out/share/include/Translate.awk --replace "\"less " "\"${less}/bin/less "
+  installFlags = [ "PREFIX=$(out)" ];
 
+  postInstall = ''
+    wrapProgram $out/bin/trans \
+      --prefix PATH : ${stdenv.lib.makeBinPath [
+        gawk
+        curl
+        ncurses
+        rlwrap
+        groff
+        fribidi
+      ]}
   '';
 
   meta = with stdenv.lib; {
     homepage = https://www.soimort.org/translate-shell;
     description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium";
-    license = licenses.publicDomain;
-    maintainers = [ maintainers.ebzzry ];
+    license = licenses.unlicense;
+    maintainers = with maintainers; [ ebzzry infinisil ];
     platforms = platforms.unix;
   };
 }

From 8067d4844e33a23a191c1ea7f7ac5c33d1499b81 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sat, 24 Mar 2018 18:11:03 -0500
Subject: [PATCH 038/119] texlive: add cxxflags for clang

Fixes #37719
---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 8318ad2afe99..92778c5eed1c 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -144,6 +144,9 @@ core = stdenv.mkDerivation rec {
     mv "$out"/share/{man,info} "$doc"/doc
   '' + cleanBrokenLinks;
 
+  # needed for poppler and xpdf
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+
   setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references)
   passthru = { inherit version buildInputs; };
 

From 7032c42dc008a007ac157dac8880125938a02350 Mon Sep 17 00:00:00 2001
From: Tyler Mauthe <me@tylermauthe.com>
Date: Sat, 24 Mar 2018 16:46:49 -0700
Subject: [PATCH 039/119] i3-gaps: 4.14.1 -> 4.15.0.1

---
 pkgs/applications/window-managers/i3/gaps.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index b322c7da193a..d6668cde2bdc 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -3,12 +3,12 @@
 i3.overrideDerivation (super : rec {
 
   name = "i3-gaps-${version}";
-  version = "4.14.1";
-  releaseDate = "2017-09-24";
+  version = "4.15.0.1";
+  releaseDate = "2018-03-13";
 
   src = fetchurl {
     url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
-    sha256 = "11fnkg4halplcnannfw3ishzwwbxbnjafmkxsim199jhlyjjd8j7";
+    sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
   };
 
   nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];

From 261a958170f1866b29ebb3429b7d271de23c87d0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 00:53:46 +0100
Subject: [PATCH 040/119] skhd: 0.0.10 -> 0.0.12

---
 pkgs/os-specific/darwin/skhd/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index aa97a36e691e..24eb644e96fb 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "skhd-${version}";
-  version = "0.0.10";
+  version = "0.0.12";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "skhd";
     rev = "v${version}";
-    sha256 = "0a0r8z9bvb1pzqag7nqa84xm99n0xvg27cw11qcv65snr06bqc9w";
+    sha256 = "09ihfd7cfqnfv095skn6rbrmjji61skwgg36b6s055fycrlbyp0h";
   };
 
   buildInputs = [ Carbon ];
@@ -21,9 +21,6 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out
   '';
 
-  # See https://github.com/koekeishiya/skhd/issues/28
-  hardeningDisable = [ "all" ];
-
   meta = with stdenv.lib; {
     description = "Simple hotkey daemon for macOS";
     homepage = https://github.com/koekeishiya/skhd;

From 72a4c54c71b1bebd974107fb792ad01e8ec9ce8e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 21:46:59 -0400
Subject: [PATCH 041/119] xmloscopy: init at 0.1.1

---
 pkgs/tools/text/xml/xmloscopy/default.nix | 52 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/tools/text/xml/xmloscopy/default.nix

diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
new file mode 100644
index 000000000000..8c25e677c8b9
--- /dev/null
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, lib, makeWrapper, dev_only_shellcheck ? null,
+fetchFromGitHub,
+
+fzf, coreutils, libxml2, libxslt, jing, findutils, gnugrep, gnused,
+docbook5
+}:
+stdenv.mkDerivation rec {
+  name = "xmloscopy-${version}";
+  version = "v0.1.1";
+
+  buildInputs = [
+    makeWrapper
+    dev_only_shellcheck
+  ];
+
+  spath = lib.makeBinPath [
+    fzf
+    coreutils
+    libxml2
+    libxslt
+    jing
+    findutils
+    gnugrep
+    gnused
+  ];
+
+  src = fetchFromGitHub {
+    owner = "grahamc";
+    repo = "xmloscopy";
+    rev = version;
+    sha256 = "01i9hr0hh87p4qxfqx4vhml2mpdqggq2326vy7nymm2d4xpa5i1i";
+  };
+
+  installPhase = ''
+    sed -i "s/hard to say/${version}/" ./xmloscopy
+    type -P shellcheck && shellcheck ./xmloscopy
+    chmod +x ./xmloscopy
+    patchShebangs ./xmloscopy
+    mkdir -p $out/bin
+    cp ./xmloscopy $out/bin/
+    wrapProgram $out/bin/xmloscopy \
+      --set RNG "${docbook5}/xml/rng/docbook/docbook.rng" \
+      --set PATH "${spath}"
+  '';
+
+  meta = {
+    description = "wtf is my docbook broken?";
+    homepage = https://github.com/grahamc/xmloscopy;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c5bc5fd2804..c3d4ce716f5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5632,6 +5632,8 @@ with pkgs;
 
   xmlroff = callPackage ../tools/typesetting/xmlroff { };
 
+  xmloscopy = callPackage ../tools/text/xml/xmloscopy { };
+
   xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { };
 
   xmlto = callPackage ../tools/typesetting/xmlto {

From 6e4a51fe54df3e2965d15d9317460aaed17b0dbf Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 24 Mar 2018 22:47:38 -0400
Subject: [PATCH 042/119] xmloscopy: 0.1.1 -> 0.1.2

Ugh this is embarassing
---
 pkgs/tools/text/xml/xmloscopy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
index 8c25e677c8b9..337aa61af13a 100644
--- a/pkgs/tools/text/xml/xmloscopy/default.nix
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -6,7 +6,7 @@ docbook5
 }:
 stdenv.mkDerivation rec {
   name = "xmloscopy-${version}";
-  version = "v0.1.1";
+  version = "v0.1.2";
 
   buildInputs = [
     makeWrapper
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     owner = "grahamc";
     repo = "xmloscopy";
     rev = version;
-    sha256 = "01i9hr0hh87p4qxfqx4vhml2mpdqggq2326vy7nymm2d4xpa5i1i";
+    sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456";
   };
 
   installPhase = ''

From dbcfee995858650d1b88192ce12a23da57088f3f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 22:40:06 -0700
Subject: [PATCH 043/119] commonsIo: 2.4 -> 2.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.6 with grep in /nix/store/5yl4dj084qj2x6xawqpbgs9bmlgxjjkb-commons-io-2.6
- found 2.6 in filename of file in /nix/store/5yl4dj084qj2x6xawqpbgs9bmlgxjjkb-commons-io-2.6
- directory tree listing: https://gist.github.com/a62494f31c4e13128a99cb347f615952
---
 pkgs/development/libraries/java/commons/io/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix
index d49165ac521a..03b083328da4 100644
--- a/pkgs/development/libraries/java/commons/io/default.nix
+++ b/pkgs/development/libraries/java/commons/io/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.4";
+  version = "2.6";
   name    = "commons-io-${version}";
 
   src = fetchurl {
     url    = "mirror://apache/commons/io/binaries/${name}-bin.tar.gz";
-    sha256 = "0m5xmjfr9k2zmbrz425q530jd0lm6368c4wm3jsjlsrqmqjpsvz1";
+    sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn";
   };
 
   installPhase = ''

From b51e229d6550b6a3e57b7247db7333cf988b7103 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 00:49:58 -0700
Subject: [PATCH 044/119] enlightenment.efl: 1.20.6 -> 1.20.7

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eina_btlog -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eet -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eet --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_gen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_gen -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_gen -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/evas_cserve2_shm_debug -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eldbus-codegen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eldbus-codegen --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eldbus-codegen help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_mount --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_umount --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eeze_disk_ls help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eetpack -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eetpack --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eetpack help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_cc -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_cc -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_cc --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_decc -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_player help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_inspector --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_external_inspector --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/edje_codegen --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumb --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/ethumbd --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen -V` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elementary_codegen --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elm_prefs_cc -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_cxx -v` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eolian_cxx --version` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/elua --help` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eina-bench-cmp -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eina-bench-cmp --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug -h` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug --help` got 0 exit code
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug -h` and found version 1.20.7
- ran `/nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7/bin/eo_debug --help` and found version 1.20.7
- found 1.20.7 with grep in /nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7
- found 1.20.7 in filename of file in /nix/store/vc2lyks2j92bi7anl097f19ymdl5sjs6-efl-1.20.7
- directory tree listing: https://gist.github.com/087102bea4216e207ad77278be475a89
---
 pkgs/desktops/enlightenment/efl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index fff15a9981d2..190ee6c3574e 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.20.6";
+  version = "1.20.7";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "1h9jkb1pkp2g6ld7ra9mxgblx3x5id4162ja697klx9mfjkpxijn";
+    sha256 = "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ea4042e8bf1565577b4f46f76cf985f6602eab1f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 01:53:25 -0700
Subject: [PATCH 045/119] fdk_aac: 0.1.5 -> 0.1.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.1.6 with grep in /nix/store/cp8yg64bk9zga197f0npsp23l1w23r1r-fdk-aac-0.1.6
- directory tree listing: https://gist.github.com/4a817b07a8c77aa7e3d16adb65f01186
---
 pkgs/development/libraries/fdk-aac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 59dc4721812c..903f43b1e685 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "fdk-aac-${version}";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
-    sha256 = "1msdkcf559agmpycd4bk0scm2s2h9jyzbnnw1yrfarxlcwm5jr11";
+    sha256 = "1bfkpqba0v2jgxqwaf9xsrr63a089wckrir497lm6nbbmi11pdma";
   };
 
   configureFlags = [ ]

From 75b43124118a23004caa9b36e7541f71d08864b3 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 05:16:03 -0700
Subject: [PATCH 046/119] hdf4: 4.2.12 -> 4.2.13

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfls help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfls help` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vmake -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vmake --help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vmake help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vshow -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vshow --help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/vshow help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdp help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdp version` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdp help` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfimport -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfimport -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdfimport -h` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hdiff -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack --help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack_check -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack_check --help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/hrepack_check help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncgen -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump -h` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump help` got 0 exit code
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump -V` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump version` and found version 4.2.13
- ran `/nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin/bin/ncdump help` and found version 4.2.13
- found 4.2.13 with grep in /nix/store/64fqrr4d4m0v3qcqxx0lvn2s4hw16g05-hdf-4.2.13-bin
- directory tree listing: https://gist.github.com/556f493010a550af3ca5bbf318e609eb
---
 pkgs/tools/misc/hdf4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix
index bc8ea769e8be..1946cbeb3f01 100644
--- a/pkgs/tools/misc/hdf4/default.nix
+++ b/pkgs/tools/misc/hdf4/default.nix
@@ -8,10 +8,10 @@
 
 stdenv.mkDerivation rec {
   name = "hdf-${version}";
-  version = "4.2.12";
+  version = "4.2.13";
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2";
-    sha256 = "020jh563sjyxsgml8l809d2i1d4ms9shivwj3gbm7n0ilxbll8id";
+    sha256 = "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm";
   };
 
   buildInputs = [

From 436d4a419262362840ccee20fc69d8186ba57cda Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 05:51:43 -0700
Subject: [PATCH 047/119] ibus-engines.libpinyin: 1.9.2 -> 1.9.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.9.3 with grep in /nix/store/z3sdj8l860r4vdb41pi3siakp98pnx8j-ibus-libpinyin-1.9.3
- directory tree listing: https://gist.github.com/bf125939ed0636cedf0daea5f6d08219
---
 .../inputmethods/ibus-engines/ibus-libpinyin/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 85399bffd3fe..bd22aefe2a95 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-libpinyin-${version}";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner  = "libpinyin";
     repo   = "ibus-libpinyin";
     rev    = version;
-    sha256 = "067w926gcf0kwwn71yshhjmyzkad0qsdm1dsi2xwz1j633qd4xlb";
+    sha256 = "02rwddv1lxzk70946v3rjsx1p7hx1d9bnwb7cx406cbws73yb2r9";
   };
 
   buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ];

From d1982e8ae7d4dd75115e65634fc94ad6f8dd1fb9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 12:06:19 -0700
Subject: [PATCH 048/119] libpqxx: 6.1.0 -> 6.1.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config -h` got 0 exit code
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config --help` got 0 exit code
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config help` got 0 exit code
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config -V` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config -v` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config --version` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config version` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config -h` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config --help` and found version 6.1.1
- ran `/nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1/bin/pqxx-config help` and found version 6.1.1
- found 6.1.1 with grep in /nix/store/kk2j3iz4kllp58v3k0jy88pr78gqb53d-libpqxx-6.1.1
- directory tree listing: https://gist.github.com/5915a75a4c094a7918ab2b42fc150b80
---
 pkgs/development/libraries/libpqxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index 97fb5f27d9dd..eb70677b3e95 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libpqxx-${version}";
-  version = "6.1.0";
+  version = "6.1.1";
 
   src = fetchFromGitHub {
     owner = "jtv";
     repo = "libpqxx";
     rev = version;
-    sha256 = "1dv96h10njg115216n2zm6fsvi4kb502hmhhn8cjhlfbxr9vc84q";
+    sha256 = "0yw0wvnpw0j560f5zv4gvmafi19d9hrknwjzl7qrss926aqx65jq";
   };
 
   nativeBuildInputs = [ gnused python2 ];

From f00db926c6f05dae081695521cb2da8f57203239 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 00:34:50 -0400
Subject: [PATCH 049/119] openjdk: Add JDK 10

---
 pkgs/development/compilers/openjdk/10.nix     | 222 ++++++++++++++++++
 .../openjdk/currency-date-range-jdk10.patch   |  13 +
 .../openjdk/fix-java-home-jdk10.patch         |  14 ++
 .../read-truststore-from-env-jdk10.patch      |  20 ++
 .../openjdk/swing-use-gtk-jdk10.patch         |  24 ++
 pkgs/top-level/all-packages.nix               |   6 +
 6 files changed, 299 insertions(+)
 create mode 100644 pkgs/development/compilers/openjdk/10.nix
 create mode 100644 pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
 create mode 100644 pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
 create mode 100644 pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
 create mode 100644 pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch

diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix
new file mode 100644
index 000000000000..d84b0c302426
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/10.nix
@@ -0,0 +1,222 @@
+{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
+, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor
+, libjpeg, giflib
+, setJavaClassPath
+, minimal ? false
+#, enableInfinality ? true # font rendering patch
+, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
+}:
+
+let
+
+  /**
+   * The JRE libraries are in directories that depend on the CPU.
+   */
+  architecture =
+    if stdenv.system == "i686-linux" then
+      "i386"
+    else "amd64";
+
+  update = "10";
+  build = "46";
+  baseurl = "http://hg.openjdk.java.net/jdk/jdk10";
+  repover = "jdk-${update}+${build}";
+  paxflags = if stdenv.isi686 then "msp" else "m";
+  jdk10 = fetchurl {
+             url = "${baseurl}/archive/${repover}.tar.gz";
+             sha256 = "1n5jccf2rw15hzwppnvy87bysb84g3fcnkxbjhj8gi0iv79dxlc7";
+          };
+  openjdk10 = stdenv.mkDerivation {
+    name = "openjdk-${update}-b${build}";
+
+    srcs = [ jdk10 ];
+    sourceRoot = ".";
+
+    outputs = [ "out" "jre" ];
+
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [
+      cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib
+      libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
+      libXi libXinerama libXcursor lndir fontconfig
+    ] ++ lib.optionals (!minimal && enableGnome2) [
+      gtk2 gnome_vfs GConf glib
+    ];
+
+    prePatch = ''
+      cd jdk10*
+    '';
+
+    patches = [
+      ./fix-java-home-jdk10.patch
+      ./read-truststore-from-env-jdk10.patch
+      ./currency-date-range-jdk10.patch
+    ] ++ lib.optionals (!minimal && enableGnome2) [
+      ./swing-use-gtk-jdk10.patch
+    ];
+
+    preConfigure = ''
+      chmod +x configure
+      substituteInPlace configure --replace /bin/bash "${bash}/bin/bash"
+
+      configureFlagsArray=(
+        "--with-boot-jdk=${bootjdk.home}"
+        "--with-update-version=${update}"
+        "--with-build-number=${build}"
+        "--with-milestone=fcs"
+        "--enable-unlimited-crypto"
+        "--disable-debug-symbols"
+        "--disable-freetype-bundling"
+        "--with-zlib=system"
+        "--with-giflib=system"
+        "--with-stdc++lib=dynamic"
+
+        # glibc 2.24 deprecated readdir_r so we need this
+        # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html
+        "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result"
+    ''
+    + lib.optionalString minimal "\"--enable-headless-only\""
+    + ");"
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1306558
+    # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716
+    + stdenv.lib.optionalString stdenv.cc.isGNU ''
+      NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error"
+    '';
+
+    NIX_LDFLAGS= lib.optionals (!minimal) [
+      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
+    ] ++ lib.optionals (!minimal && enableGnome2) [
+      "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ];
+
+    buildFlags = [ "all" ];
+
+    installPhase = ''
+      mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
+
+      cp -av build/*/images/jdk/* $out/lib/openjdk
+
+      # Remove some broken manpages.
+      rm -rf $out/lib/openjdk/man/ja*
+
+      # Mirror some stuff in top-level.
+      mkdir $out/include $out/share/man
+      ln -s $out/lib/openjdk/include/* $out/include/
+      ln -s $out/lib/openjdk/man/* $out/share/man/
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/linux/*_md.h $out/include/
+
+      # Copy the JRE to a separate output and setup fallback fonts
+      cp -av build/*/images/jre $jre/lib/openjdk/
+      mkdir $out/lib/openjdk/jre
+      ${lib.optionalString (!minimal) ''
+        mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
+        lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
+      ''}
+
+      # Remove crap from the installation.
+      rm -rf $out/lib/openjdk/demo
+      ${lib.optionalString minimal ''
+        for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do
+          rm ''${d}/{libjsound,libjsoundalsa,libawt*,libfontmanager}.so
+        done
+      ''}
+
+      lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+
+      # Make sure cmm/*.pf are not symlinks:
+      # https://youtrack.jetbrains.com/issue/IDEA-147272
+      # in 9, it seems no *.pf files end up in $out ... ?
+      # rm -rf $out/lib/openjdk/jre/lib/cmm
+      # ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+
+      # Set PaX markings
+      exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+      echo "to mark: *$exes*"
+      for file in $exes; do
+        echo "marking *$file*"
+        paxmark ${paxflags} "$file"
+      done
+
+      # Remove duplicate binaries.
+      for i in $(cd $out/lib/openjdk/bin && echo *); do
+        if [ "$i" = java ]; then continue; fi
+        if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
+          ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
+        fi
+      done
+
+      # Generate certificates.
+      (
+        cd $jre/lib/openjdk/jre/lib/security
+        rm cacerts
+        perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt
+      )
+
+      ln -s $out/lib/openjdk/bin $out/bin
+      ln -s $jre/lib/openjdk/jre/bin $jre/bin
+      ln -s $jre/lib/openjdk/jre $out/jre
+    '';
+
+    # FIXME: this is unnecessary once the multiple-outputs branch is merged.
+    preFixup = ''
+      prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
+      patchELF $jre
+      propagatedBuildInputs+=" $jre"
+
+      # Propagate the setJavaClassPath setup hook from the JRE so that
+      # any package that depends on the JRE has $CLASSPATH set up
+      # properly.
+      mkdir -p $jre/nix-support
+      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
+      echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs
+
+      # Set JAVA_HOME automatically.
+      mkdir -p $out/nix-support
+      cat <<EOF > $out/nix-support/setup-hook
+      if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+      EOF
+    '';
+
+    postFixup = ''
+      # Build the set of output library directories to rpath against
+      LIBDIRS=""
+      for output in $outputs; do
+        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
+      done
+
+      # Add the local library paths to remove dependencies on the bootstrap
+      for output in $outputs; do
+        OUTPUTDIR=$(eval echo \$$output)
+        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
+        echo "$BINLIBS" | while read i; do
+          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+          patchelf --shrink-rpath "$i" || true
+        done
+      done
+
+      # Test to make sure that we don't depend on the bootstrap
+      for output in $outputs; do
+        if grep -q -r '${bootjdk}' $(eval echo \$$output); then
+          echo "Extraneous references to ${bootjdk} detected"
+          exit 1
+        fi
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://openjdk.java.net/;
+      license = licenses.gpl2;
+      description = "The open-source Java Development Kit";
+      maintainers = with maintainers; [ edwtjo ];
+      platforms = ["i686-linux" "x86_64-linux"];
+    };
+
+    passthru = {
+      inherit architecture;
+      home = "${openjdk10}/lib/openjdk";
+    };
+  };
+in openjdk10
diff --git a/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
new file mode 100644
index 000000000000..e058eff07466
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/currency-date-range-jdk10.patch
@@ -0,0 +1,13 @@
+--- ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
++++ ./make/jdk/src/classes/build/tools/generatecurrencydata/GenerateCurrencyData.java
+@@ -281,8 +281,8 @@
+             checkCurrencyCode(newCurrency);
+             String timeString = currencyInfo.substring(4, length - 4);
+             long time = format.parse(timeString).getTime();
+-            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
+-                throw new RuntimeException("time is more than 10 years from present: " + time);
++            if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
++                throw new RuntimeException("time is more than 20 years from present: " + time);
+             }
+             specialCaseCutOverTimes[specialCaseCount] = time;
+             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
diff --git a/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
new file mode 100644
index 000000000000..c037fde29722
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/fix-java-home-jdk10.patch
@@ -0,0 +1,14 @@
+--- a/src/hotspot/os/linux/os_linux.cpp	2017-07-04 23:09:02.533972226 -0400
++++ b/src/hotspot/os/linux/os_linux.cpp	2017-07-04 23:07:52.118338845 -0400
+@@ -2270,8 +2270,5 @@
+   assert(ret, "cannot locate libjvm");
+   char *rp = NULL;
+   if (ret && dli_fname[0] != '\0') {
+-    rp = os::Posix::realpath(dli_fname, buf, buflen);
+-  }
+-  if (rp == NULL) {
+-    return;
++    snprintf(buf, buflen, "%s", dli_fname);
+   }
+
+   if (Arguments::sun_java_launcher_is_altjvm()) {
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
new file mode 100644
index 000000000000..b5abc1d794db
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
@@ -0,0 +1,20 @@
+--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java	2017-06-26 21:48:25.000000000 -0400
++++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java	2017-07-05 20:45:57.491295030 -0400
+@@ -71,6 +71,7 @@
+      *
+      * The preference of the default trusted KeyStore is:
+      *    javax.net.ssl.trustStore
++     *    system environment variable JAVAX_NET_SSL_TRUSTSTORE
+      *    jssecacerts
+      *    cacerts
+      */
+@@ -144,6 +145,9 @@
+                     String temporaryName = "";
+                     File temporaryFile = null;
+                     long temporaryTime = 0L;
++                    if (storePropName == null){
++                        storePropName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
++                    }
+                     if (!"NONE".equals(storePropName)) {
+                         String[] fileNames =
+                                 new String[] {storePropName, defaultStore};
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
new file mode 100644
index 000000000000..b9258c500db4
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk10.patch
@@ -0,0 +1,24 @@
+--- a/src/java.desktop/share/classes/javax/swing/UIManager.java
++++ b/src/java.desktop/share/classes/javax/swing/UIManager.java
+@@ -607,11 +607,9 @@
+         if (osType == OSInfo.OSType.WINDOWS) {
+             return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
+         } else {
+-            String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop"));
+             Toolkit toolkit = Toolkit.getDefaultToolkit();
+-            if ("gnome".equals(desktop) &&
+-                    toolkit instanceof SunToolkit &&
+-                    ((SunToolkit) toolkit).isNativeGTKAvailable()) {
++            if (toolkit instanceof SunToolkit &&
++                    ((SunToolkit) toolkit).isNativeGTKAvailable()) {
+                 // May be set on Linux and Solaris boxs.
+                 return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
+             }
+@@ -1341,7 +1339,7 @@
+             lafName = (String) lafData.remove("defaultlaf");
+         }
+         if (lafName == null) {
+-            lafName = getCrossPlatformLookAndFeelClassName();
++            lafName = getSystemLookAndFeelClassName();
+         }
+         lafName = swingProps.getProperty(defaultLAFKey, lafName);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3d4ce716f5a..be80143d29d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6379,6 +6379,12 @@ with pkgs;
         inherit (gnome2) GConf gnome_vfs;
       };
 
+  openjdk10 =
+      callPackage ../development/compilers/openjdk/10.nix {
+        bootjdk = openjdk9;
+        inherit (gnome2) GConf gnome_vfs;
+      };
+
   openjdk = openjdk8;
 
   jdk7 = openjdk7 // { outputs = [ "out" ]; };

From 351688f53e5407f3c7cab9ef3769334858f4a50c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 00:41:17 -0400
Subject: [PATCH 050/119] zulu: 9.0.4 -> 10

---
 pkgs/development/compilers/zulu/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix             | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 040af83ece20..908aa29e178f 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -4,11 +4,11 @@
 , swingSupport ? true }:
 
 let
-  version = "9.0.0.15";
-  openjdk = "9.0.0";
+  version = "10.1+11";
+  openjdk = "10";
 
-  sha256_linux = "0s9vr135yhdnxqds4hfafyrlh33j6g78v6l1v0ap2y6yqgabh9qi";
-  sha256_darwin = "104w1msrwijf8dv3n65hjinp7i47z6ygzjipdzqriqam2zljxn4b";
+  sha256_linux = "0g51n2zc7inal29n5ly3mrrfj15c7vl87zb6b2r1q67n4mnbrgm8";
+  sha256_darwin = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y";
 
   platform = if stdenv.isDarwin then "macosx" else "linux";
   hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be80143d29d9..10d230a4e8df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6894,8 +6894,7 @@ with pkgs;
   z88dk = callPackage ../development/compilers/z88dk { };
 
   zulu8 = callPackage ../development/compilers/zulu/8.nix { };
-  zulu9 = callPackage ../development/compilers/zulu { };
-  zulu = zulu9;
+  zulu = callPackage ../development/compilers/zulu { };
 
   ### DEVELOPMENT / INTERPRETERS
 

From 040a9ab240fba0b0dae5b48692fff7be50d3281c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 00:49:02 -0400
Subject: [PATCH 051/119] minikube: 0.25.0 -> 0.25.2

---
 pkgs/applications/networking/cluster/minikube/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index d27693823a61..d181335ee35f 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -15,15 +15,15 @@ let
   # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
   # currently https://storage.googleapis.com/minikube/k8s_releases.json
 
-  localkube-version = "1.9.0";
+  localkube-version = "1.9.4";
   localkube-binary = fetchurl {
     url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
-    sha256 = "1z5c061mx2flg6hq05d00bvkn722gxv8y9rfpjyk23nk697k31fh";
+    sha256 = "0c1n8p7q38hx864xvcsr01d028cizjfpsqbfpf1y24fnrpzacajw";
   };
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.25.0";
+  version = "0.25.2";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -31,7 +31,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "0nsdi8mr8p69z696ksfb5ahzqqnvjn4a2z6cp0kyby8sakcjhsby";
+    sha256 = "1h8sxs6xxmli7xkb33kdl4nyn1sgq2b8b2d6aj5wim11ric3l7pb";
   };
 
   patches = [

From b189247ba0b568da59bdb1ab82c5d95b8a85ba24 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 24 Mar 2018 22:04:25 -0700
Subject: [PATCH 052/119] treewide: use more HTTPS URLs

Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.

Also fixes jbake source URL, which was broken.
---
 lib/licenses.nix                              |  2 +-
 .../services/cluster/kubernetes/default.nix   | 12 ++---
 .../applications/altcoins/ethsign/default.nix |  2 +-
 pkgs/applications/audio/audacious/default.nix |  2 +-
 pkgs/applications/audio/audacious/qt-5.nix    |  2 +-
 .../audio/lastfmsubmitd/default.nix           |  4 +-
 .../audio/mopidy-gmusic/default.nix           |  2 +-
 .../audio/mopidy-spotify/default.nix          |  2 +-
 pkgs/applications/graphics/leocad/default.nix |  2 +-
 pkgs/applications/misc/k2pdfopt/default.nix   |  2 +-
 pkgs/applications/misc/mupdf/default.nix      |  2 +-
 pkgs/applications/misc/mupdf/default.upstream |  2 +-
 pkgs/applications/misc/wordnet/default.nix    |  2 +-
 .../networking/firehol/default.nix            |  2 +-
 .../networking/ostinato/default.nix           |  2 +-
 .../science/electronics/pulseview/default.nix |  4 +-
 .../window-managers/i3/default.nix            |  2 +-
 .../window-managers/i3/status.nix             |  2 +-
 .../data/fonts/gentium-book-basic/default.nix |  2 +-
 .../sgml+xml/schemas/docbook-5.0/default.nix  |  2 +-
 pkgs/desktops/lxde/core/lxmenu-data.nix       |  2 +-
 pkgs/desktops/lxde/core/lxpanel/default.nix   |  2 +-
 .../compilers/adobe-flex-sdk/default.nix      |  2 +-
 pkgs/development/compilers/neko/default.nix   |  2 +-
 pkgs/development/compilers/opendylan/bin.nix  |  4 +-
 .../java-modules/junit/default.nix            |  2 +-
 pkgs/development/libraries/gamin/default.nix  |  2 +-
 .../libraries/ignition-transport/generic.nix  |  2 +-
 pkgs/development/libraries/isl/0.11.1.nix     |  2 +-
 pkgs/development/libraries/isl/0.12.2.nix     |  2 +-
 pkgs/development/libraries/isl/0.14.1.nix     |  2 +-
 pkgs/development/libraries/isl/0.15.0.nix     |  2 +-
 pkgs/development/libraries/isl/0.17.1.nix     |  2 +-
 pkgs/development/libraries/jama/default.nix   |  4 +-
 .../libraries/libaudclient/default.nix        |  2 +-
 pkgs/development/libraries/libmnl/default.nix |  2 +-
 .../libnetfilter_conntrack/default.nix        |  4 +-
 .../libnetfilter_cttimeout/default.nix        |  4 +-
 .../libraries/libnetfilter_log/default.nix    |  4 +-
 .../libraries/libtheora/default.nix           |  2 +-
 .../development/libraries/liburcu/default.nix |  4 +-
 pkgs/development/libraries/libvpx/git.nix     |  2 +-
 .../development/libraries/log4cxx/default.nix |  2 +-
 pkgs/development/libraries/movit/default.nix  |  2 +-
 .../libraries/netcdf-fortran/default.nix      |  2 +-
 pkgs/development/libraries/ogre/1.9.x.nix     |  2 +-
 pkgs/development/libraries/opencv/3.x.nix     |  2 +-
 .../libraries/pipewire/default.nix            |  2 +-
 pkgs/development/libraries/tnt/default.nix    |  4 +-
 pkgs/development/misc/amdapp-sdk/default.nix  |  2 +-
 .../python-modules/GeoIP/default.nix          |  2 +-
 .../python-modules/autobahn/default.nix       |  2 +-
 .../python-modules/cytoolz/default.nix        |  2 +-
 .../python-modules/flask-assets/default.nix   |  2 +-
 .../python-modules/flask-script/default.nix   |  2 +-
 .../python-modules/graph-tool/2.x.x.nix       |  2 +-
 .../python-modules/idna/default.nix           |  2 +-
 .../python-modules/jsonref/default.nix        |  2 +-
 .../python-modules/jsonrpc-async/default.nix  |  2 +-
 .../python-modules/locustio/default.nix       |  2 +-
 .../python-modules/logilab/constraint.nix     |  2 +-
 .../python-modules/meliae/default.nix         |  2 +-
 .../python-modules/moinmoin/default.nix       |  2 +-
 .../python-modules/pecan/default.nix          |  2 +-
 .../tools/database/pyrseas/default.nix        |  2 +-
 pkgs/development/tools/jbake/default.nix      |  4 +-
 pkgs/development/tools/libsigrok/default.nix  |  6 +--
 .../tools/libsigrokdecode/default.nix         |  4 +-
 .../tools/misc/lttng-tools/default.nix        |  2 +-
 .../tools/misc/lttng-ust/default.nix          |  2 +-
 pkgs/development/tools/misc/lttv/default.nix  |  4 +-
 pkgs/development/tools/sigrok-cli/default.nix |  4 +-
 pkgs/games/cataclysm-dda/default.nix          |  2 +-
 pkgs/games/cataclysm-dda/git.nix              |  2 +-
 pkgs/games/dxx-rebirth/assets.nix             |  2 +-
 pkgs/games/dxx-rebirth/default.nix            |  6 +--
 pkgs/games/dxx-rebirth/full.nix               |  2 +-
 pkgs/misc/emulators/fs-uae/default.nix        |  2 +-
 pkgs/misc/emulators/pcsxr/default.nix         |  2 +-
 .../linux/lttng-modules/default.nix           |  4 +-
 pkgs/servers/dict/dictd-wordnet.nix           |  2 +-
 pkgs/servers/gpm/default.nix                  |  4 +-
 pkgs/servers/irc/ngircd/default.nix           |  2 +-
 pkgs/servers/sql/mysql/5.7.x.nix              |  2 +-
 pkgs/tools/filesystems/bindfs/default.nix     |  2 +-
 pkgs/tools/filesystems/ceph/generic.nix       |  2 +-
 pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix   |  2 +-
 pkgs/tools/inputmethods/fcitx/unwrapped.nix   |  2 +-
 pkgs/tools/misc/argtable/default.nix          |  2 +-
 pkgs/tools/misc/edid-decode/default.nix       |  2 +-
 pkgs/top-level/python-packages.nix            | 50 +++++++++----------
 91 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index ba575c27052d..767fd89b948c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -284,7 +284,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
 
   gpl2Oss = {
     fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)";
-    url = http://www.mysql.com/about/legal/licensing/foss-exception;
+    url = https://www.mysql.com/about/legal/licensing/foss-exception;
   };
 
   gpl2Plus = spdx {
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 4a2c6f0833eb..39c5d78d4191 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -279,7 +279,7 @@ in {
       tokenAuthFile = mkOption {
         description = ''
           Kubernetes apiserver token authentication file. See
-          <link xlink:href="http://kubernetes.io/docs/admin/authentication.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/authentication.html"/>
         '';
         default = null;
         type = types.nullOr types.path;
@@ -288,7 +288,7 @@ in {
       basicAuthFile = mkOption {
         description = ''
           Kubernetes apiserver basic authentication file. See
-          <link xlink:href="http://kubernetes.io/docs/admin/authentication.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/authentication.html"/>
         '';
         default = pkgs.writeText "users" ''
           kubernetes,admin,0
@@ -299,7 +299,7 @@ in {
       authorizationMode = mkOption {
         description = ''
           Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
-          <link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/authorization.html"/>
         '';
         default = ["RBAC" "Node"];
         type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]);
@@ -308,7 +308,7 @@ in {
       authorizationPolicy = mkOption {
         description = ''
           Kubernetes apiserver authorization policy file. See
-          <link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/authorization.html"/>
         '';
         default = [];
         type = types.listOf types.attrs;
@@ -332,7 +332,7 @@ in {
       runtimeConfig = mkOption {
         description = ''
           Api runtime configuration. See
-          <link xlink:href="http://kubernetes.io/docs/admin/cluster-management.html"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/cluster-management.html"/>
         '';
         default = "authentication.k8s.io/v1beta1=true";
         example = "api/all=false,api/v1=true";
@@ -342,7 +342,7 @@ in {
       admissionControl = mkOption {
         description = ''
           Kubernetes admission control plugins to use. See
-          <link xlink:href="http://kubernetes.io/docs/admin/admission-controllers/"/>
+          <link xlink:href="https://kubernetes.io/docs/admin/admission-controllers/"/>
         '';
         default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"];
         example = [
diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix
index b7d14a43921b..0659c4fa2585 100644
--- a/pkgs/applications/altcoins/ethsign/default.nix
+++ b/pkgs/applications/altcoins/ethsign/default.nix
@@ -52,7 +52,7 @@ buildGoPackage rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://github.com/dapphub/ethsign;
+    homepage = https://github.com/dapphub/ethsign;
     description = "Make raw signed Ethereum transactions";
     license = [licenses.gpl3];
   };
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 6890b53f407d..6e411c8448f6 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Audio player";
-    homepage = http://audacious-media-player.org/;
+    homepage = https://audacious-media-player.org/;
     maintainers = with maintainers; [ eelco ramkromberg ];
     platforms = with platforms; linux;
     license = with licenses; [
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index 8910fdc1b0a8..019bde7cc64a 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -81,7 +81,7 @@ mkDerivation {
 
   meta = with lib; {
     description = "Audio player";
-    homepage = http://audacious-media-player.org/;
+    homepage = https://audacious-media-player.org/;
     maintainers = with maintainers; [ ttuegel ];
     platforms = with platforms; linux;
     license = with licenses; [
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index 01b450ab7dd0..d0c3eab69154 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec {
   version = "1.0.6";
 
   src = fetchurl {
-    url = "http://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz";
+    url = "https://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz";
     sha256 = "c2636d5095a95167366bacd458624d67b046e060244fa54ba2c2e3efb79f9b0e";
   };
 
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
   installCommand = "python setup.py install --prefix=$out";
 
   meta = {
-    homepage = http://www.red-bean.com/decklin/lastfmsubmitd/;
+    homepage = https://www.red-bean.com/decklin/lastfmsubmitd/;
     description = "An last.fm audio scrobbler and daemon";
   };
 }
diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix
index b792ec3428e7..e58cddd42942 100644
--- a/pkgs/applications/audio/mopidy-gmusic/default.nix
+++ b/pkgs/applications/audio/mopidy-gmusic/default.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = http://www.mopidy.com/;
+    homepage = https://www.mopidy.com/;
     description = "Mopidy extension for playing music from Google Play Music";
     license = licenses.asl20;
     maintainers = [ maintainers.jgillich ];
diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix
index 999883dc26c3..64b5ee629b33 100644
--- a/pkgs/applications/audio/mopidy-spotify/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify/default.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = http://www.mopidy.com/;
+    homepage = https://www.mopidy.com/;
     description = "Mopidy extension for playing music from Spotify";
     license = licenses.asl20;
     maintainers = [ maintainers.rickynils ];
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 4dc1e89116ed..ada55f0351e1 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "CAD program for creating virtual LEGO models";
-    homepage = http://www.leocad.org/;
+    homepage = https://www.leocad.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 1cab20baef15..ad2381394f46 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     mupdf_modded = mupdf.overrideAttrs (attrs: {
       name = "mupdf-1.10a";
       src = fetchurl {
-        url = "http://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
+        url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
         sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
       };
       # Excluded the pdf-*.c files, since they mostly just broke the #includes
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 1b510221d121..000a916b737a 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
   name = "mupdf-${version}";
 
   src = fetchurl {
-    url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
+    url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
     sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw";
   };
 
diff --git a/pkgs/applications/misc/mupdf/default.upstream b/pkgs/applications/misc/mupdf/default.upstream
index 07cafdb0c2a4..852233633ca5 100644
--- a/pkgs/applications/misc/mupdf/default.upstream
+++ b/pkgs/applications/misc/mupdf/default.upstream
@@ -1,4 +1,4 @@
-url http://mupdf.com/downloads/archive/
+url https://mupdf.com/downloads/archive/
 do_overwrite(){
   ensure_hash
   ensure_version
diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index b93295850bcd..71d95e138927 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
          for computational linguistics and natural language processing.
       '';
 
-    homepage = http://wordnet.princeton.edu/;
+    homepage = https://wordnet.princeton.edu/;
 
     maintainers = [ ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix
index cf41ca1b0b3b..8bbc0abba221 100644
--- a/pkgs/applications/networking/firehol/default.nix
+++ b/pkgs/applications/networking/firehol/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
       FireHOL, an iptables stateful packet filtering firewall for humans!
       FireQOS, a TC based bandwidth shaper for humans!
     '';
-    homepage = http://firehol.org/;
+    homepage = https://firehol.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ geistesk ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index b3a1c1a23b37..c03202517747 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   ostinatoIcon = fetchurl {
-    url = "http://ostinato.org/images/site-logo.png";
+    url = "https://ostinato.org/images/site-logo.png";
     sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
   };
 
diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix
index a3f3b6b8933f..4e86d1d917f8 100644
--- a/pkgs/applications/science/electronics/pulseview/default.nix
+++ b/pkgs/applications/science/electronics/pulseview/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "pulseview-0.4.0";
 
   src = fetchurl {
-    url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/pulseview/${name}.tar.gz";
     sha256 = "1f8f2342d5yam98mmcb8f9g2vslcwv486bmi4x45pxn68l82ky3q";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)";
-    homepage = http://sigrok.org/;
+    homepage = https://sigrok.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 9c24df004f39..46c87b0b189e 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "4.15";
 
   src = fetchurl {
-    url = "http://i3wm.org/downloads/${name}.tar.bz2";
+    url = "https://i3wm.org/downloads/${name}.tar.bz2";
     sha256 = "09jk70hsdxab24lqvj2f30ijrkbv3f6q9xi5dcsax1dw3x6m4z91";
   };
 
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 19c9f8c98351..b54f6e8def33 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "i3status-2.11";
 
   src = fetchurl {
-    url = "http://i3wm.org/i3status/${name}.tar.bz2";
+    url = "https://i3wm.org/i3status/${name}.tar.bz2";
     sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq";
   };
 
diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix
index 4c1e484253cf..9b626291c2cb 100644
--- a/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -19,7 +19,7 @@ in fetchzip rec {
   sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd";
 
   meta = with stdenv.lib; {
-    homepage = http://software.sil.org/gentium/;
+    homepage = https://software.sil.org/gentium/;
     description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
     maintainers = with maintainers; [ ];
     license = licenses.ofl;
diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
index 640659a61080..4986101584e1 100644
--- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
+++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation";
-    homepage = http://docbook.org/xml/5.0/;
+    homepage = https://docbook.org/xml/5.0/;
     maintainers = [ lib.maintainers.eelco ];
     platforms = lib.platforms.all;
   };
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
index b17ab4fda659..6e8644b19b0c 100644
--- a/pkgs/desktops/lxde/core/lxmenu-data.nix
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool ];
 
   meta = {
-    homepage = http://lxde.org/;
+    homepage = https://lxde.org/;
     license = stdenv.lib.licenses.gpl2;
     description = "Freedesktop.org desktop menus for LXDE";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index 1225f425b263..af9570a2c733 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Lightweight X11 desktop panel for LXDE";
-    homepage = http://lxde.org/;
+    homepage = https://lxde.org/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.ryneeverett ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix
index ccb366ffe1cb..63dd315e8e4e 100644
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Flex SDK for Adobe Flash / ActionScript";
-    homepage = "http://www.adobe.com/products/flex.html";
+    homepage = "https://www.adobe.com/products/flex.html";
     license = stdenv.lib.licenses.mpl11;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 4dce11f93b13..42a585ff51f0 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "2.2.0";
 
   src = fetchurl {
-    url = "http://nekovm.org/media/neko-${version}-src.tar.gz";
+    url = "https://nekovm.org/media/neko-${version}-src.tar.gz";
     sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g";
   };
 
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
index 8382be7a2091..d3f654749b04 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation {
   name = "opendylan-2013.2";
 
   src = if stdenv.system == "x86_64-linux" then fetchurl {
-      url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2;
+      url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2;
       sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h";
     }
     else if stdenv.system == "i686-linux" then fetchurl {
-      url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2;
+      url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2;
       sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5";
     }
     else throw "platform ${stdenv.system} not supported.";
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 5017cb39602e..a7bfa545908a 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -19,7 +19,7 @@ in rec {
     m2Path = "/junit/junit/${version}";
 
     meta = {
-      homepage = http://junit.org/junit4/;
+      homepage = https://junit.org/junit4/;
       description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
       license = stdenv.lib.licenses.epl10;
       platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index 2dd32b6f1100..2af7bbce18bc 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation (rec {
   name = "gamin-0.1.10";
 
   src = fetchurl {
-    url = "http://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
+    url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
     sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
   };
 
diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix
index 8206338fb080..639af2dd2089 100644
--- a/pkgs/development/libraries/ignition-transport/generic.nix
+++ b/pkgs/development/libraries/ignition-transport/generic.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://ignitionrobotics.org/libraries/math;
+    homepage = https://ignitionrobotics.org/libraries/math;
     description = "Math library by Ingition Robotics, created for the Gazebo project";
     license = licenses.asl20;
     maintainers = with maintainers; [ pxc ];
diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix
index e2d7d7ffd034..cdb018d297b6 100644
--- a/pkgs/development/libraries/isl/0.11.1.nix
+++ b/pkgs/development/libraries/isl/0.11.1.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix
index d7143b8747ee..880f91fccedc 100644
--- a/pkgs/development/libraries/isl/0.12.2.nix
+++ b/pkgs/development/libraries/isl/0.12.2.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix
index 8196dec283ac..1ff4b7ec18a0 100644
--- a/pkgs/development/libraries/isl/0.14.1.nix
+++ b/pkgs/development/libraries/isl/0.14.1.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/isl/0.15.0.nix b/pkgs/development/libraries/isl/0.15.0.nix
index eca3372ad4d0..8b6080c2880a 100644
--- a/pkgs/development/libraries/isl/0.15.0.nix
+++ b/pkgs/development/libraries/isl/0.15.0.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix
index 2136969c0752..59d4d38ce574 100644
--- a/pkgs/development/libraries/isl/0.17.1.nix
+++ b/pkgs/development/libraries/isl/0.17.1.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://www.kotnet.org/~skimo/isl/;
+    homepage = https://www.kotnet.org/~skimo/isl/;
     license = stdenv.lib.licenses.lgpl21;
     description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 55f44df2b4f3..36eedadc4c2e 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.2.5";
   
   src = fetchurl {
-    url = http://math.nist.gov/tnt/jama125.zip;
+    url = https://math.nist.gov/tnt/jama125.zip;
     sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://math.nist.gov/tnt/;
+    homepage = https://math.nist.gov/tnt/;
     description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix
index b81eba5252f8..aab8fcd4beb8 100644
--- a/pkgs/development/libraries/libaudclient/default.nix
+++ b/pkgs/development/libraries/libaudclient/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Legacy D-Bus client library for Audacious";
-    homepage = http://audacious-media-player.org/;
+    homepage = https://audacious-media-player.org/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; unix;
diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix
index 33ccccea2e95..2dbdb60b4b66 100644
--- a/pkgs/development/libraries/libmnl/default.nix
+++ b/pkgs/development/libraries/libmnl/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       This library aims to provide simple helpers that allows you to re-use code and to avoid
       re-inventing the wheel.
     '';
-    homepage = http://netfilter.org/projects/libmnl/index.html;
+    homepage = https://netfilter.org/projects/libmnl/index.html;
     license = stdenv.lib.licenses.lgpl21Plus;
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 17dea7b3d7d2..1b4c471a2567 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.6";
 
   src = fetchurl {
-    url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
     sha256 = "1svzyf3rq9nbrcw1jsricgyhh7x1am8iqn6kjr6mzrw42810ik7g";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used
       by conntrack-tools among many other applications
     '';
-    homepage = http://netfilter.org/projects/libnetfilter_conntrack/;
+    homepage = https://netfilter.org/projects/libnetfilter_conntrack/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index f30e12a41631..d16155374ca8 100644
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.0";
 
   src = fetchurl {
-    url = "http://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_cttimeout/files/${name}.tar.bz2";
     sha256 = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       With this library, you can create, update and delete timeout policies that can
       be attached to traffic flows. This library is used by conntrack-tools.
     '';
-    homepage = http://netfilter.org/projects/libnetfilter_cttimeout/;
+    homepage = https://netfilter.org/projects/libnetfilter_cttimeout/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix
index f660cd7a7814..0d8de14513ed 100644
--- a/pkgs/development/libraries/libnetfilter_log/default.nix
+++ b/pkgs/development/libraries/libnetfilter_log/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.1";
 
   src = fetchurl {
-    url = "http://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2";
+    url = "https://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2";
     sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       system that deprecates the old syslog/dmesg based packet logging. This
       library has been previously known as libnfnetlink_log.
     '';
-    homepage = http://netfilter.org/projects/libnetfilter_log/;
+    homepage = https://netfilter.org/projects/libnetfilter_log/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ orivej ];
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index 375c59f77631..fd58f4f44e78 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.theora.org/;
+    homepage = https://www.theora.org/;
     description = "Library for Theora, a free and open video compression format";
     license = licenses.bsd3;
     maintainers = with maintainers; [ spwhitt wkennington ];
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index aa106baf8152..85f8b6df2959 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "liburcu-${version}";
 
   src = fetchurl {
-    url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
+    url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
     sha256 = "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw";
   };
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Userspace RCU (read-copy-update) library";
-    homepage = http://lttng.org/urcu;
+    homepage = https://lttng.org/urcu;
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index 824449a347af..ef499f238d63 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -180,7 +180,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "WebM VP8/VP9 codec SDK";
-    homepage    = http://www.webmproject.org/;
+    homepage    = https://www.webmproject.org/;
     license     = licenses.bsd3;
     maintainers = with maintainers; [ codyopel ];
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index ac0b7bf68341..8e8541564245 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ libtool ];
 
   meta = {
-    homepage = http://logging.apache.org/log4cxx/index.html;
+    homepage = https://logging.apache.org/log4cxx/index.html;
     description = "A logging framework for C++ patterned after Apache log4j";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index d85d4f444077..3766140eea1e 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.5.1";
 
   src = fetchurl {
-    url = "http://movit.sesse.net/${name}.tar.gz";
+    url = "https://movit.sesse.net/${name}.tar.gz";
     sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
   };
 
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
index 35f675a305af..a26db9c3a713 100644
--- a/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fortran API to manipulate netcdf files";
-    homepage = http://www.unidata.ucar.edu/software/netcdf/;
+    homepage = https://www.unidata.ucar.edu/software/netcdf/;
     license = licenses.free;
     maintainers = [ maintainers.bzizou ];
     platforms = platforms.unix;
diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix
index 694fbaa50c1c..0f6495f0c9c1 100644
--- a/pkgs/development/libraries/ogre/1.9.x.nix
+++ b/pkgs/development/libraries/ogre/1.9.x.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A 3D engine";
-    homepage = http://www.ogre3d.org/;
+    homepage = https://www.ogre3d.org/;
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.mit;
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 49574a4b421b..101b38d6305b 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -260,7 +260,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Open Computer Vision Library with more than 500 algorithms";
-    homepage = http://opencv.org/;
+    homepage = https://opencv.org/;
     license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3;
     maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk];
     platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 90174bf749ad..6658a554a353 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Server and user space API to deal with multimedia pipelines";
-    homepage = http://pipewire.org/;
+    homepage = https://pipewire.org/;
     license = licenses.lgpl21;
     platforms = platforms.linux;
     maintainers = with maintainers; [ jtojnar ];
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 5e3d16000004..23ef997e5ce1 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.0.12";
   
   src = fetchurl {
-    url = http://math.nist.gov/tnt/tnt_3_0_12.zip;
+    url = https://math.nist.gov/tnt/tnt_3_0_12.zip;
     sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://math.nist.gov/tnt/;
+    homepage = https://math.nist.gov/tnt/;
     description = "Template Numerical Toolkit: C++ headers for array and matrices";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index d0e64a16fddf..84020a5ac2d5 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -99,7 +99,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support";
-    homepage = http://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/;
+    homepage = https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/;
     license = licenses.amd;
     maintainers = [ maintainers.offline ];
     platforms = [ "i686-linux" "x86_64-linux" ];
diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix
index 6c4453774ced..0bacd8edb312 100644
--- a/pkgs/development/python-modules/GeoIP/default.nix
+++ b/pkgs/development/python-modules/GeoIP/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "MaxMind GeoIP Legacy Database - Python API";
-    homepage = http://www.maxmind.com/;
+    homepage = https://www.maxmind.com/;
     maintainers = with lib.maintainers; [ jluttine ];
     license = lib.licenses.lgpl21Plus;
   };
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 5a6121aaf7f4..69ee2b1b15f6 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "WebSocket and WAMP in Python for Twisted and asyncio.";
-    homepage    = "http://crossbar.io/autobahn";
+    homepage    = "https://crossbar.io/autobahn";
     license     = licenses.mit;
     maintainers = with maintainers; [ nand0p ];
     platforms   = platforms.all;
diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix
index 9c5a2b2110ce..f7022d91626a 100644
--- a/pkgs/development/python-modules/cytoolz/default.nix
+++ b/pkgs/development/python-modules/cytoolz/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = "http://github.com/pytoolz/cytoolz/";
+    homepage = "https://github.com/pytoolz/cytoolz/";
     description = "Cython implementation of Toolz: High performance functional utilities";
     license = "licenses.bsd3";
     maintainers = with lib.maintainers; [ fridh ];
diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix
index 53307333048e..27d8f9c40c65 100644
--- a/pkgs/development/python-modules/flask-assets/default.nix
+++ b/pkgs/development/python-modules/flask-assets/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ flask webassets flask_script nose ];
 
   meta = with lib; {
-    homepage = http://github.com/miracle2k/flask-assets;
+    homepage = https://github.com/miracle2k/flask-assets;
     description = "Asset management for Flask, to compress and merge CSS and Javascript files";
     license = licenses.bsd2;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix
index 33b44080343f..72a3fb0c6f85 100644
--- a/pkgs/development/python-modules/flask-script/default.nix
+++ b/pkgs/development/python-modules/flask-script/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = http://github.com/smurfix/flask-script;
+    homepage = https://github.com/smurfix/flask-script;
     description = "Scripting support for Flask";
     license = licenses.bsd3;
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index 99fe4b73cb98..8c61a6b278ae 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Python module for manipulation and statistical analysis of graphs";
-    homepage    = http://graph-tool.skewed.de/;
+    homepage    = https://graph-tool.skewed.de/;
     license     = licenses.gpl3;
     platforms   = platforms.all;
     maintainers = [ stdenv.lib.maintainers.joelmo ];
diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix
index 635f8b33d3c6..e66700d87ee0 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   };
 
   meta = {
-    homepage = "http://github.com/kjd/idna/";
+    homepage = "https://github.com/kjd/idna/";
     description = "Internationalized Domain Names in Applications (IDNA)";
     license = lib.licenses.bsd3;
   };
diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix
index ca9549b677bb..6209c2593a7a 100644
--- a/pkgs/development/python-modules/jsonref/default.nix
+++ b/pkgs/development/python-modules/jsonref/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "An implementation of JSON Reference for Python";
-    homepage    = "http://github.com/gazpachoking/jsonref";
+    homepage    = "https://github.com/gazpachoking/jsonref";
     license     = licenses.mit;
     maintainers = with maintainers; [ nand0p ];
     platforms   = platforms.all;
diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix
index 1018c536ff7d..2bdb93dfdf2d 100644
--- a/pkgs/development/python-modules/jsonrpc-async/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-async/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A JSON-RPC client library for asyncio";
-    homepage = http://github.com/armills/jsonrpc-async;
+    homepage = https://github.com/armills/jsonrpc-async;
     license = licenses.bsd3;
     maintainers = with maintainers; [ peterhoeg ];
   };
diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix
index 4bc48810e71d..c3e27c8b36a0 100644
--- a/pkgs/development/python-modules/locustio/default.nix
+++ b/pkgs/development/python-modules/locustio/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   buildInputs = [ mock unittest2 ];
 
   meta = {
-    homepage = http://locust.io/;
+    homepage = https://locust.io/;
     description = "A load testing tool";
   };
 }
diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix
index 952cc03e454e..8f7229a4c0f0 100644
--- a/pkgs/development/python-modules/logilab/constraint.nix
+++ b/pkgs/development/python-modules/logilab/constraint.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "logilab-database provides some classes to make unified access to different";
-    homepage = "http://www.logilab.org/project/logilab-database";
+    homepage = "https://www.logilab.org/project/logilab-database";
   };
 }
 
diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix
index ec6c15b25012..5a348e5288c4 100644
--- a/pkgs/development/python-modules/meliae/default.nix
+++ b/pkgs/development/python-modules/meliae/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python Memory Usage Analyzer";
-    homepage = http://launchpad.net/meliae;
+    homepage = https://launchpad.net/meliae;
     license = licenses.gpl3;
     maintainers = with maintainers; [ xvapx ];
   };
diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix
index 6891dd2b6272..2097470d4e47 100644
--- a/pkgs/development/python-modules/moinmoin/default.nix
+++ b/pkgs/development/python-modules/moinmoin/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Advanced, easy to use and extensible WikiEngine";
 
-    homepage = "http://moinmo.in/";
+    homepage = "https://moinmo.in/";
 
     license = licenses.gpl2Plus;
   };
diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
index 3a49a32a8a0e..c6c5b99d9806 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Pecan";
-    homepage = "http://github.com/pecan/pecan";
+    homepage = "https://github.com/pecan/pecan";
   };
 }
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix
index 20123a0600e7..0390e7b86bbc 100644
--- a/pkgs/development/tools/database/pyrseas/default.nix
+++ b/pkgs/development/tools/database/pyrseas/default.nix
@@ -38,7 +38,7 @@ pythonPackages.buildPythonApplication rec {
   ];
   meta = {
     description = "A declarative language to describe PostgreSQL databases";
-    homepage = http://perseas.github.io/;
+    homepage = https://perseas.github.io/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ pmeunier ];
   };
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 9762926ddf5e..045ade6e0edc 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "jbake-${version}";
 
   src = fetchzip {
-    url = "http://jbake.org/files/jbake-${version}-bin.zip";
+    url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
     sha256 = "1ib5gvz6sl7k0ywx22anhz69i40wc6jj5lxjxj2aa14qf4lrw912";
   };
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "JBake is a Java based, open source, static site/blog generator for developers & designers";
-    homepage = "http://jbake.org/";
+    homepage = "https://jbake.org/";
     license = licenses.mit;
     maintainers = with maintainers; [ moaxcp ];
   };
diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix
index 1f4c21cb7f9c..0271cbee92c1 100644
--- a/pkgs/development/tools/libsigrok/default.nix
+++ b/pkgs/development/tools/libsigrok/default.nix
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
   name = "libsigrok-${version}";
 
   src = fetchurl {
-    url = "http://sigrok.org/download/source/libsigrok/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/libsigrok/${name}.tar.gz";
     inherit sha256;
   };
 
   firmware = fetchurl {
-    url = "http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz";
+    url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz";
     sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl";
   };
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Core library of the sigrok signal analysis software suite";
-    homepage = http://sigrok.org/;
+    homepage = https://sigrok.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix
index 57bb159c5863..0099e574e4ae 100644
--- a/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/pkgs/development/tools/libsigrokdecode/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libsigrokdecode-0.5.0";
 
   src = fetchurl {
-    url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
     sha256 = "1hfigfj1976qk11kfsgj75l20qvyq8c9p2h4mjw23d59rsg5ga2a";
   };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Protocol decoding library for the sigrok signal analysis software suite";
-    homepage = http://sigrok.org/;
+    homepage = https://sigrok.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index eea54dbdf8be..236402b56634 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tracing tools (kernel + user space) for Linux";
-    homepage = http://lttng.org/;
+    homepage = https://lttng.org/;
     license = licenses.lgpl21;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index edfc7dc30ca6..b708ce490d29 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "LTTng Userspace Tracer libraries";
-    homepage = http://lttng.org/;
+    homepage = https://lttng.org/;
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix
index 45dd86db41b2..36a89726e81c 100644
--- a/pkgs/development/tools/misc/lttv/default.nix
+++ b/pkgs/development/tools/misc/lttv/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "lttv-1.5";
 
   src = fetchurl {
-    url = "http://lttng.org/files/packages/${name}.tar.bz2";
+    url = "https://lttng.org/files/packages/${name}.tar.bz2";
     sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1";
   };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Graphical trace viewer for LTTng trace files";
-    homepage = http://lttng.org/;
+    homepage = https://lttng.org/;
     # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
     # The rest of the LTTV package is distributed under the GNU GPL v2.
     license = with licenses; [ gpl2 lgpl21 ];
diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix
index 2d36b09adb35..3d8027a12994 100644
--- a/pkgs/development/tools/sigrok-cli/default.nix
+++ b/pkgs/development/tools/sigrok-cli/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "sigrok-cli-0.7.0";
 
   src = fetchurl {
-    url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/sigrok-cli/${name}.tar.gz";
     sha256 = "072ylscp0ppgii1k5j07hhv7dfmni4vyhxnsvxmgqgfyq9ldjsan";
   };
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Command-line frontend for the sigrok signal analysis software suite";
-    homepage = http://sigrok.org/;
+    homepage = https://sigrok.org/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index 01829238daa2..0de118234a7d 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
       substances or radiation, now more closely resemble insects, birds or fish
       than their original form.
     '';
-    homepage = http://cataclysmdda.org/;
+    homepage = https://cataclysmdda.org/;
     license = licenses.cc-by-sa-30;
     maintainers = [ maintainers.skeidel ];
     platforms = platforms.unix;
diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix
index fcc2481cb695..fe4dcb251753 100644
--- a/pkgs/games/cataclysm-dda/git.nix
+++ b/pkgs/games/cataclysm-dda/git.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
       substances or radiation, now more closely resemble insects, birds or fish
       than their original form.
     '';
-    homepage = http://cataclysmdda.org/;
+    homepage = https://cataclysmdda.org/;
     license = licenses.cc-by-sa-30;
     platforms = platforms.unix;
   };
diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix
index 1fd64f5b00d0..682d1e05069a 100644
--- a/pkgs/games/dxx-rebirth/assets.nix
+++ b/pkgs/games/dxx-rebirth/assets.nix
@@ -42,7 +42,7 @@ let
 
     meta = with stdenv.lib; {
       description = "Descent ${toString ver} assets from GOG";
-      homepage    = http://www.dxx-rebirth.com/;
+      homepage    = https://www.dxx-rebirth.com/;
       license     = licenses.unfree;
       maintainers = with maintainers; [ peterhoeg ];
       hydraPlatforms = [];
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 3b05ed142929..b780d5327f2e 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -4,7 +4,7 @@
 
 let
   music = fetchurl {
-    url = "http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa";
+    url = "https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa";
     sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc";
   };
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   version = "0.59.100";
 
   src = fetchurl {
-    url = "http://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz";
+    url = "https://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz";
     sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka";
   };
 
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Source Port of the Descent 1 and 2 engines";
-    homepage = http://www.dxx-rebirth.com/;
+    homepage = https://www.dxx-rebirth.com/;
     license = licenses.free;
     maintainers = with maintainers; [ viric peterhoeg ];
     platforms = with platforms; linux;
diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix
index baf8b80add10..020a4593de24 100644
--- a/pkgs/games/dxx-rebirth/full.nix
+++ b/pkgs/games/dxx-rebirth/full.nix
@@ -16,7 +16,7 @@ let
 
     meta = with stdenv.lib; {
       description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG";
-      homepage    = http://www.dxx-rebirth.com/;
+      homepage    = https://www.dxx-rebirth.com/;
       license     = with licenses; [ free unfree ];
       maintainers = with maintainers; [ peterhoeg ];
       platforms   = with platforms; linux;
diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 6ba5290fa424..27abe5fd470d 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "2.8.3";
 
   src = fetchurl {
-    url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
+    url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz";
     sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2";
   };
 
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix
index c402dd444289..5af3042bde4d 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/pkgs/misc/emulators/pcsxr/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Playstation 1 emulator";
-    homepage = http://pcsxr.codeplex.com/;
+    homepage = https://pcsxr.codeplex.com/;
     maintainers = with maintainers; [ rardiol ];
     license = licenses.gpl2Plus;
     platforms = platforms.all;
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index ff6db1b41ee5..7c2233714d4c 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "2.10.5";
 
   src = fetchurl {
-    url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
+    url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
     sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq";
   };
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Linux kernel modules for LTTng tracing";
-    homepage = http://lttng.org/;
+    homepage = https://lttng.org/;
     license = with licenses; [ lgpl21 gpl2 mit ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 8bed7f160f7b..13a78d61098b 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
          the wordnet data available to dictd and by extension for lookup with
          the dict command. '';
 
-    homepage = http://wordnet.princeton.edu/;
+    homepage = https://wordnet.princeton.edu/;
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index 6096aa1ed74d..3cb0d3931db3 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "gpm-1.20.7";
 
   src = fetchurl {
-    url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2";
+    url = "https://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2";
     sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh";
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.nico.schottelius.org/software/gpm/;
+    homepage = https://www.nico.schottelius.org/software/gpm/;
     description = "A daemon that provides mouse support on the Linux console";
     license = licenses.gpl2;
     platforms = platforms.linux ++ platforms.cygwin;
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index 4dd57b17fed3..bdd88db09844 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "ngircd-24";
 
   src = fetchurl {
-    url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
+    url = "https://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
     sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp";
   };
 
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 0c04f910e5bb..b6b1dc7b1272 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -71,7 +71,7 @@ self = stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = http://www.mysql.com/;
+    homepage = https://www.mysql.com/;
     description = "The world's most popular open source database";
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index c558c9e8a320..a83ee771d699 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name    = "bindfs-${version}";
 
   src = fetchurl {
-    url    = "http://bindfs.org/downloads/${name}.tar.gz";
+    url    = "https://bindfs.org/downloads/${name}.tar.gz";
     sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc";
   };
 
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 3d35a10f3b3b..34becf80c8a9 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -165,7 +165,7 @@ stdenv.mkDerivation {
   outputs = [ "dev" "lib" "out" "doc" ];
 
   meta = {
-    homepage = http://ceph.com/;
+    homepage = https://ceph.com/;
     description = "Distributed storage system";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ adev ak wkennington ];
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index 7617d544d296..1a3352676b15 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://github.com/fcitx/fcitx-qt5;
+    homepage    = https://github.com/fcitx/fcitx-qt5;
     description = "Qt5 IM Module for Fcitx";
     license     = licenses.gpl2;
     platforms   = platforms.linux;
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index 27eb35ce6ae5..c7d0eecb763c 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage    = http://github.com/fcitx/fcitx;
+    homepage    = https://github.com/fcitx/fcitx;
     description = "A Flexible Input Method Framework";
     license     = licenses.gpl2;
     platforms   = platforms.linux;
diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix
index 76f42b1976ae..6b1512e854b0 100644
--- a/pkgs/tools/misc/argtable/default.nix
+++ b/pkgs/tools/misc/argtable/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.argtable.org/;
+    homepage = https://www.argtable.org/;
     description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library";
     license = licenses.bsd3;
     maintainers = with maintainers; [ artuuge ];
diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix
index e4968b12e6cc..246898a72317 100644
--- a/pkgs/tools/misc/edid-decode/default.nix
+++ b/pkgs/tools/misc/edid-decode/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "EDID decoder and conformance tester";
-    homepage = http://cgit.freedesktop.org/xorg/app/edid-decode/;
+    homepage = https://cgit.freedesktop.org/xorg/app/edid-decode/;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.chiiruno ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a86c79da03d1..6412cb59be2d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -775,7 +775,7 @@ in {
 
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -790,7 +790,7 @@ in {
     };
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -810,7 +810,7 @@ in {
     '';
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -830,7 +830,7 @@ in {
     '';
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -855,7 +855,7 @@ in {
     propagatedBuildInputs = with self; [ azure-mgmt-common ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -880,7 +880,7 @@ in {
     propagatedBuildInputs = with self; [ azure-mgmt-common ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -896,7 +896,7 @@ in {
     propagatedBuildInputs = with self; [ azure-nspkg ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -921,7 +921,7 @@ in {
     propagatedBuildInputs = with self; [ azure-mgmt-common ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -946,7 +946,7 @@ in {
     propagatedBuildInputs = with self; [ azure-mgmt-common ];
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -965,7 +965,7 @@ in {
     '';
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -984,7 +984,7 @@ in {
     '';
     meta = {
       description = "Microsoft Azure SDK for Python";
-      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      homepage = "https://azure.microsoft.com/en-us/develop/python/";
       license = licenses.asl20;
       maintainers = with maintainers; [ olcai ];
     };
@@ -1750,7 +1750,7 @@ in {
 
     meta = {
       description = "Python bindings for Oracle Berkeley DB";
-      homepage = http://www.jcea.es/programacion/pybsddb.htm;
+      homepage = https://www.jcea.es/programacion/pybsddb.htm;
       license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x
     };
   };
@@ -1861,7 +1861,7 @@ in {
     doCheck = false;
 
     meta = {
-      homepage =  http://github.com/ralphbean/bugwarrior;
+      homepage =  https://github.com/ralphbean/bugwarrior;
       description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior";
       license = licenses.gpl3Plus;
       platforms = platforms.all;
@@ -4686,7 +4686,7 @@ in {
 
     meta = {
       description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible";
-      homepage = http://mg.pov.lt/gtimelog/;
+      homepage = https://mg.pov.lt/gtimelog/;
       license = licenses.gpl2Plus;
       maintainers = with maintainers; [ ocharles ];
       platforms = platforms.unix;
@@ -5512,7 +5512,7 @@ in {
 
     meta = {
       description = "PAM interface using ctypes";
-      homepage = "http://github.com/minrk/pamela";
+      homepage = "https://github.com/minrk/pamela";
       license = licenses.mit;
     };
   };
@@ -5561,7 +5561,7 @@ in {
 
     meta = {
       description = "A Python-based build/distribution/deployment scripting tool";
-      homepage    = http://github.com/paver/paver;
+      homepage    = https://github.com/paver/paver;
       maintainers = with maintainers; [ lovek323 ];
       platforms   = platforms.unix;
     };
@@ -7640,7 +7640,7 @@ in {
 
     meta = {
       description = "Filesystem abstraction";
-      homepage    = http://pypi.python.org/pypi/fs;
+      homepage    = https://pypi.python.org/pypi/fs;
       license     = licenses.bsd3;
       maintainers = with maintainers; [ lovek323 ];
       platforms   = platforms.unix;
@@ -8398,7 +8398,7 @@ in {
     '';
 
     meta = {
-      homepage = "http://falcao.it/HTTPretty/";
+      homepage = "https://falcao.it/HTTPretty/";
       description = "HTTP client request mocking tool";
       license = licenses.mit;
     };
@@ -8838,7 +8838,7 @@ in {
 
     meta = {
       description = "Messaging library for Python";
-      homepage    = "http://github.com/celery/kombu";
+      homepage    = "https://github.com/celery/kombu";
       license     = licenses.bsd3;
     };
   };
@@ -9076,7 +9076,7 @@ in {
     '';
 
     meta = {
-      homepage = http://launchpad.net/pylockfile;
+      homepage = https://launchpad.net/pylockfile;
       description = "Platform-independent advisory file locking capability for Python applications";
       license = licenses.asl20;
     };
@@ -10383,7 +10383,7 @@ in {
     };
 
     meta = {
-      homepage = http://alastairs-place.net/projects/netifaces/;
+      homepage = https://alastairs-place.net/projects/netifaces/;
       description = "Portable access to network interfaces from Python";
     };
   };
@@ -10937,7 +10937,7 @@ in {
 
     meta = {
       description = "Draws Python object reference graphs with graphviz";
-      homepage = http://mg.pov.lt/objgraph/;
+      homepage = https://mg.pov.lt/objgraph/;
       license = licenses.mit;
     };
   };
@@ -18924,7 +18924,7 @@ EOF
     doCheck = false;
 
     meta = {
-      homepage = "http://matplotlib.org/basemap/";
+      homepage = "https://matplotlib.org/basemap/";
       description = "Plot data on map projections with matplotlib";
       longDescription = ''
         An add-on toolkit for matplotlib that lets you plot data on map projections with
@@ -19084,7 +19084,7 @@ EOF
 
     meta = {
       description = "Copy your docs directly to the gh-pages branch";
-      homepage = "http://github.com/davisp/ghp-import";
+      homepage = "https://github.com/davisp/ghp-import";
       license = "Tumbolia Public License";
       maintainers = with maintainers; [ garbas ];
     };
@@ -19200,7 +19200,7 @@ EOF
 
     meta = {
       description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
-      homepage = "http://docs.openstack.org/infra/system-config/jjb.html";
+      homepage = "https://docs.openstack.org/infra/system-config/jjb.html";
       license = licenses.asl20;
       maintainers = with maintainers; [ garbas ];
     };

From 6e6d0bd23415beb3698cd167cf0a41997c839870 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 15:54:01 -0700
Subject: [PATCH 053/119] lightdm_gtk_greeter: 2.0.4 -> 2.0.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.Ened4Ypstm /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.5 with grep in /nix/store/w1whi2qkvm97pbk0mjigs7xhnd2vgczx-lightdm-gtk-greeter-2.0.5
- directory tree listing: https://gist.github.com/7fa4fc4e3d6e3d17e75f94d3a9798382
---
 .../display-managers/lightdm-gtk-greeter/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 685f9c159b65..3227151ce21e 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -9,14 +9,14 @@
 
 let
   ver_branch = "2.0";
-  version = "2.0.4";
+  version = "2.0.5";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
-    sha256 = "1svbyq2l3l2d72k10nw79jz940rqsskryaim2viy6jfpv9k5jfv1";
+    sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From fc9c26d83847c3fa653277738f046f78af6509e7 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 14:11:13 -0700
Subject: [PATCH 054/119] kid3: 3.5.1 -> 3.6.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.FSRC6h0qrp /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0/bin/kid3-cli -h` got 0 exit code
- ran `/nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0/bin/kid3-cli --help` got 0 exit code
- ran `/nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0/bin/kid3-cli -h` and found version 3.6.0
- ran `/nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0/bin/kid3-cli --help` and found version 3.6.0
- found 3.6.0 with grep in /nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0
- found 3.6.0 in filename of file in /nix/store/b7qyswz8glvmami13ij30d7xxsi6631n-kid3-3.6.0
- directory tree listing: https://gist.github.com/55e96f99bdc127e8e0ab453dc59880e8
---
 pkgs/applications/audio/kid3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 24421b527e16..680542dc405b 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -10,11 +10,11 @@
 stdenv.mkDerivation rec {
 
   name = "kid3-${version}";
-  version = "3.5.1";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
-    sha256 = "09iryxnhg8d9q36a4brb25bqkjprkx5kl0x7vyy82gxivqk0ihl8";
+    sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p";
   };
 
   buildInputs = with stdenv.lib;

From d78464723bc79320601ae4be4a83b364e5a88c5c Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 22 Mar 2018 21:30:42 +0100
Subject: [PATCH 055/119] kmsxx: build with gcc6

gcc7 build fails with "internal compiler error"
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10d230a4e8df..35cf1a3baeba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13214,7 +13214,9 @@ with pkgs;
 
   kmscube = callPackage ../os-specific/linux/kmscube { };
 
-  kmsxx = callPackage ../development/libraries/kmsxx { };
+  kmsxx = callPackage ../development/libraries/kmsxx {
+    stdenv = overrideCC stdenv gcc6;
+  };
 
   latencytop = callPackage ../os-specific/linux/latencytop { };
 

From 0beff72eaea15881fd253731a5493a1a41397c2d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 13:12:24 -0700
Subject: [PATCH 056/119] ircdHybrid: 8.2.21 -> 8.2.22

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.m29kbtRZ7x /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd -h` got 0 exit code
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd --help` got 0 exit code
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd -V` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd -v` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd --version` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/mkpasswd --help` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/ircd help` got 0 exit code
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/ircd version` and found version 8.2.22
- ran `/nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22/bin/ircd help` and found version 8.2.22
- found 8.2.22 with grep in /nix/store/z0r8fy3q89hq2dp62h084q6s5m9bpxi6-ircd-hybrid-8.2.22
- directory tree listing: https://gist.github.com/4a91920bc15a662018a588fbd3e819d1
---
 pkgs/servers/irc/ircd-hybrid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index c13a0ee3d89b..656f0aa02233 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "ircd-hybrid-8.2.21";
+  name = "ircd-hybrid-8.2.22";
 
   src = fetchurl {
     url = "mirror://sourceforge/ircd-hybrid/${name}.tgz";
-    sha256 = "19cgrgmmz1c72x4gxpd39f9ckm4j9cp1gpgvlkk73d3v13znfzy3";
+    sha256 = "1i5iv5hc8gbaw74mz18zdjzv3dsvyvr8adldj8p1726h4i2xzn6p";
   };
 
   buildInputs = [ openssl zlib ];

From d4930aceaf36f45912c6c06d41e7ed0d8b14a5a2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 12:58:33 -0700
Subject: [PATCH 057/119] imagemagick7: 7.0.7-22 -> 7.0.7-27

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.quAyurRyhL /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick -h` got 0 exit code
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick --help` got 0 exit code
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick help` got 0 exit code
- ran `/nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27/bin/magick --version` and found version 7.0.7-27
- found 7.0.7-27 with grep in /nix/store/8n4a2v0wfmzlk9n2bdv919ybg17bai8c-imagemagick-7.0.7-27
- directory tree listing: https://gist.github.com/4c89cc9d32b6739922d277619629d087
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index e716146ec7a9..410c74ac6cfa 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.7-22";
-    sha256 = "1ad7mwx48xrkvm3v060n2f67kmi0qk7gfql1shiwbkkjvzzaaiam";
+    version = "7.0.7-27";
+    sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k";
     patches = [];
   };
 in

From e08c2638f2c2e73f6f2647ab68cc77f8b4434d1d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 11:27:55 -0700
Subject: [PATCH 058/119] gitAndTools.gitRemoteGcrypt: 1.0.0 -> 1.0.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.HNtjNxAelH /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.3 with grep in /nix/store/y4rmp0i9bslzh2izpjhl9glklwhd9ypn-git-remote-gcrypt-1.0.3
- directory tree listing: https://gist.github.com/4dd37ba2fc098537882e10e0c38823bb
---
 .../git-and-tools/git-remote-gcrypt/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 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 1208afa19630..5e41db0e03f8 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
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "git-remote-gcrypt-${version}";
-  version = "1.0.0";
+  version = "1.0.3";
   rev = version;
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "spwhitton";
     repo = "git-remote-gcrypt";
-    sha256 = "0c8ig1pdqj7wjwldnf62pmm2x29ri62x6b24mbsl2nxzkqbwh379";
+    sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1";
   };
 
   outputs = [ "out" "man" ];

From 38ad43dd897bf2b951149b744671a8e6cd65df5e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 11:13:11 -0700
Subject: [PATCH 059/119] gitAndTools.git-recent: 1.0.3 -> 1.0.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.Laok6v3TeR /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/git-recent -h` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/git-recent --help` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/git-recent help` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/.git-recent-wrapped -h` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/.git-recent-wrapped --help` got 0 exit code
- ran `/nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4/bin/.git-recent-wrapped help` got 0 exit code
- found 1.0.4 with grep in /nix/store/0qpj62pcv8gvlyimr7bmmhnq2y4kq59c-git-recent-1.0.4
- directory tree listing: https://gist.github.com/a5c51e3598313240f56c2e95a8ddf85e
---
 .../version-management/git-and-tools/git-recent/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index ae1139e99937..0272d4414607 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -11,13 +11,13 @@ let
     ++ stdenv.lib.optional (utillinux != null) utillinux);
 in stdenv.mkDerivation rec {
   name = "git-recent-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-recent";
     rev = "v${version}";
-    sha256 = "0rckjjrw2xmvmbqaf66i36x59vs1v4pfnmvbinx5iggp7vjly1a4";
+    sha256 = "0dbnm5b2v04fy0jgzphm3xvz9scx0n4p10fw8wjd0cy56308h79k";
   };
 
   buildInputs = [ makeWrapper ];

From 826d114390b4af5b4978dddaa1c9658254a59603 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 11:12:12 -0700
Subject: [PATCH 060/119] gitAndTools.git-extras: 4.4.0 -> 4.5.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.nnPD4LOmby /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0/bin/git-extras -v` and found version 4.5.0
- ran `/nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0/bin/git-extras --version` and found version 4.5.0
- ran `/nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0/bin/git-standup -h` got 0 exit code
- ran `/nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0/bin/git-standup help` got 0 exit code
- found 4.5.0 with grep in /nix/store/5f91kx2c84gnfkvaw7lfs73ziwfih3y3-git-extras-4.5.0
- directory tree listing: https://gist.github.com/a7a8d5fdc1d2b452c08a12f2319907dd
---
 .../version-management/git-and-tools/git-extras/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index abd9013b6b03..e4db75c8ad7a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "git-extras-${version}";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchurl {
     url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
-    sha256 = "0vb8syyr5nbvmkj5g4rb1p8rqxb2hyl25gbyf4rd0b972d7iihhn";
+    sha256 = "059680bvblbhrlkybg1yisr5zq62pir1rnaxz5izhfsw2ng9s2fb";
   };
 
   dontBuild = true;

From cbb81720fc6eb50ecdde0f66b27becd8d1a392ae Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 02:34:10 -0700
Subject: [PATCH 061/119] rdma-core: 17 -> 17.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibv_asyncwatch -h` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibv_asyncwatch --help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibv_asyncwatch -h` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibv_asyncwatch --help` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rxe_cfg -h` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rxe_cfg --help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rxe_cfg help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/ibacm help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd -h` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd --help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd -V` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd -v` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd --version` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd -h` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/iwpmd --help` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd -h` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd --help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd help` got 0 exit code
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd -V` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd -v` and found version 17.1
- ran `/nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1/bin/rdma-ndd --version` and found version 17.1
- found 17.1 with grep in /nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1
- found 17.1 in filename of file in /nix/store/2c9wjl45czzxkjdg6gggnqz19jky6ml6-rdma-core-17.1
- directory tree listing: https://gist.github.com/bc45415978e0954a49f501d71dead508
---
 pkgs/os-specific/linux/rdma-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index b25ed85ce4b3..9aa938068791 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "17";
+  version = "17.1";
 
 in stdenv.mkDerivation {
   name = "rdma-core-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "1xql46favv8i4ni4zqkk9ra2kcqq2dyn7jyi940c869lndmjw9ni";
+    sha256 = "019h5q0szjccdgfk13qy0f2dxd0n1fr407b3qqq1vcmx41w9b6vz";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 5dbaf1f018990e565b5d09c4188e16bce7f73f3a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 07:45:50 -0700
Subject: [PATCH 062/119] xineLib: 1.2.6 -> 1.2.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 -h` got 0 exit code
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 --help` got 0 exit code
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 help` got 0 exit code
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 -v` and found version 1.2.9
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 --version` and found version 1.2.9
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 -h` and found version 1.2.9
- ran `/nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9/bin/xine-list-1.2 --help` and found version 1.2.9
- found 1.2.9 with grep in /nix/store/hnckr7rw59jim490swa9xq3nbn98c411-xine-lib-1.2.9
- directory tree listing: https://gist.github.com/0b66f70c336b62519465be16269e2cce
---
 pkgs/development/libraries/xine-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 9bb9f7986e6d..274a70057bdd 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xine-lib-1.2.6";
+  name = "xine-lib-1.2.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/xine/${name}.tar.xz";
-    sha256 = "01d0nv4zhr4k8id5n4rmw13llrjsv9dhwg1a773c1iqpi1ris15x";
+    sha256 = "13clir4qxl2zvsvvjd9yv3yrdhsnvcn5s7ambbbn5dzy9604xcrj";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];

From 90c143a9b96ed3e75c356dd4b4c34683c9b469ec Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 09:41:01 -0700
Subject: [PATCH 063/119] xmlrpc_c: 1.33.17 -> 1.39.12

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/4cdb0kvm05d8390pg3agfy7hjm9ygd9s-xmlrpc-c-1.39.12/bin/xmlrpc-c-config --help` got 0 exit code
- ran `/nix/store/4cdb0kvm05d8390pg3agfy7hjm9ygd9s-xmlrpc-c-1.39.12/bin/xmlrpc-c-config --version` and found version 1.39.12
- ran `/nix/store/4cdb0kvm05d8390pg3agfy7hjm9ygd9s-xmlrpc-c-1.39.12/bin/xmlrpc-c-config --help` and found version 1.39.12
- found 1.39.12 with grep in /nix/store/4cdb0kvm05d8390pg3agfy7hjm9ygd9s-xmlrpc-c-1.39.12
- directory tree listing: https://gist.github.com/02ef530309005ffeedbc4af16ffd467c
---
 pkgs/development/libraries/xmlrpc-c/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
index 0b5f08bdf9b3..92e3424a5f6a 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, curl, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "xmlrpc-c-1.33.17";
+  name = "xmlrpc-c-1.39.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
-    sha256 = "0makq1zpfqnrj6xx1xc7wi4mh115ri9p4yz2rbvjhj0il4y8l4ah";
+    sha256 = "026fh7w7y3q9pvxd09i5d4hq3l6gd81n9k19yq4zwbc398kg6c6q";
   };
 
   buildInputs = [ curl libxml2 ];

From 385d311ebebef1d74917c79a1000a19773b45ae6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 07:55:19 -0700
Subject: [PATCH 064/119] xineUI: 0.99.9 -> 0.99.10

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check -h` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check --help` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check help` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check -V` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check --version` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check version` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check -h` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check --help` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-check help` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport -h` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport --help` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport help` got 0 exit code
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport -V` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport --version` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport version` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport -h` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport --help` and found version 0.99.10
- ran `/nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10/bin/xine-bugreport help` and found version 0.99.10
- found 0.99.10 with grep in /nix/store/zca8nmwqrr97lpvmprr5hqglxlqig2d4-xine-ui-0.99.10
- directory tree listing: https://gist.github.com/38a0309d9443aca1e54f071937c1e1cc
---
 pkgs/applications/video/xine-ui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 5e44116415ea..b75145a3e4a3 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -2,11 +2,11 @@
 , lirc, shared-mime-info, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "xine-ui-0.99.9";
+  name = "xine-ui-0.99.10";
   
   src = fetchurl {
     url = "mirror://sourceforge/xine/${name}.tar.xz";
-    sha256 = "18liwmkbj75xs9bipw3vr67a7cwmdfcp04v5lph7nsjlkwhq1lcd";
+    sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a";
   };
   
   nativeBuildInputs = [ pkgconfig shared-mime-info ];

From a48d58ff73781ebbc9e7107631f58b3c8c33e2f5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 01:49:38 -0700
Subject: [PATCH 065/119] pius: 2.2.4 -> 2.2.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.2.6 with grep in /nix/store/q9ca3k22liz3dsaipnlnw8fmggpqx1n1-pius-2.2.6
- directory tree listing: https://gist.github.com/0d14ff30c172f091a342653aae676f55
---
 pkgs/tools/security/pius/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index 908a47e6326f..eb05c3748078 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -1,6 +1,6 @@
 { fetchFromGitHub, stdenv, pythonPackages, gnupg }:
 
-let version = "2.2.4"; in
+let version = "2.2.6"; in
 pythonPackages.buildPythonApplication {
   name = "pius-${version}";
   namePrefix = "";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication {
     owner = "jaymzh";
     repo = "pius";
     rev = "v${version}";
-    sha256 = "1yk6ngpk55yjdnzhm5sj675xbzwp7rir816a3aris647gsph1vlx";
+    sha256 = "1rffwyjd84rwx1w5yyqckirm1kdj80ldfwjlw91kk74swhpbpzzj";
   };
 
   patchPhase = ''

From 2e02bcaedcbaaa954d37524ba853e44c9a04b296 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Tue, 20 Mar 2018 17:07:15 +0000
Subject: [PATCH 066/119] toml: init at 0.9.4

---
 .../python-modules/toml/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/toml/default.nix

diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix
new file mode 100644
index 000000000000..a80657dc4b45
--- /dev/null
+++ b/pkgs/development/python-modules/toml/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "toml";
+  version = "0.9.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf";
+  };
+
+  # This package has a test script (built for Travis) that involves a)
+  # looking in the home directory for a binary test runner and b) using
+  # git to download a test suite.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "a Python library for parsing and creating TOML";
+    homepage = "https://github.com/uiri/toml";
+    license = licenses.mit;
+    maintainers = with maintainers; [ twey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf755ada5bd1..963b255a8876 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -424,6 +424,8 @@ in {
 
   tokenserver = callPackage ../development/python-modules/tokenserver {};
 
+  toml = callPackage ../development/python-modules/toml { };
+
   unifi = callPackage ../development/python-modules/unifi { };
 
   pyunbound = callPackage ../tools/networking/unbound/python.nix { };

From 275cd497314464226343fa31cee271fb9d4c8025 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Thu, 15 Mar 2018 21:25:14 +0100
Subject: [PATCH 067/119] geogebra: 5-0-382-0 -> 5-0-444-0

---
 pkgs/applications/science/math/geogebra/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index ef6b266eaaf2..b486d01a4099 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,20 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-382-0";
+  version = "5-0-444-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
-    urls = [
-      "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
-
-      # Fallback for 5-0-382-0
-      # To avoid breaks when latest geogebra version is
-      # removed from `download.geogebra.org`
-      "http://web.archive.org/web/20170818191250/http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-5-0-382-0.tar.bz2"
-    ];
-    sha256 = "0xqln1ssm35q8ry4a0ly8rkgw41brmrhn26l6q6r0qqrnw85cnyv";
+    urls = "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
+    sha256 = "1x2h40m62zbhmy42hln5gjj3fwk4b6803v3k9agpv5c6j468sq0p";
   };
 
   srcIcon = fetchurl {

From 404c80791f0c7a7eaf21a8f0b6209008508071c3 Mon Sep 17 00:00:00 2001
From: Kai Harries <kai.harries@gmail.com>
Date: Sun, 25 Mar 2018 09:00:31 +0200
Subject: [PATCH 068/119] debian-devscripts: add dpkg in PATH

The script uscan was complaining about missing dpkg, therefore I have
added it to the PATH.
---
 pkgs/tools/misc/debian-devscripts/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 810bf06527b0..a08f465d6cd7 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -54,7 +54,8 @@ in stdenv.mkDerivation rec {
       wrapProgram "$i" \
         --prefix PERL5LIB : "$PERL5LIB" \
         --prefix PERL5LIB : "$out/share/devscripts" \
-        --prefix PYTHONPATH : "$out/lib/python3.4/site-packages"
+        --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" \
+        --prefix PATH : "${dpkg}/bin"
     done
   '';
 

From db0d6c908d2bd5960aba4edc6011f15d0f27e2c6 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@protonmail.ch>
Date: Sun, 25 Mar 2018 11:04:08 +0300
Subject: [PATCH 069/119] hyperfine: 0.4.0 -> 1.0.0

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

diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index 322151739843..0b04ee1e2811 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "hyperfine-${version}";
-  version = "0.4.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "hyperfine";
     rev    = "refs/tags/v${version}";
-    sha256 = "1ynqyacbx0x971lyd1k406asms58bc7vzl8gca3sg34rx0hx3wzi";
+    sha256 = "0prmnhyp20w71l3mjqgdr38q94cqr1xayzgj7ibbq2hdick4w5nn";
   };
 
-  cargoSha256 = "109yv1618bi19vh1jjv2ki06mafhcrv35a3a1zsr34kg3gsjv0rb";
+  cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s";
 
   meta = with stdenv.lib; {
     description = "Command-line benchmarking tool";

From 6e863d1558e29e46b371189a6c25d04170d1c7ef Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 25 Mar 2018 14:09:22 +0200
Subject: [PATCH 070/119] gitlab-runner: 10.5.0 -> 10.6.0

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 5181361abf67..6cce9803c915 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "10.5.0";
+  version = "10.6.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "1ywfki1599ggyq0g3r8f7pi1njvvjz41kjhssfax20ljm2c6q5v0";
+    sha256 = "0icn4xgnlrmxvhbw1lrdkg3x0cr9vhbi1vc51ahd708f9hd64ik6";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "0r71zvyg17926h2vpjr3q16l1yqcb8ky21ic5arc7jh82nzywywl";
+    sha256 = "0wgkvgcmby89w1vy06v7milj62656zflw2wi2g30645g72gz0as9";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "13c9jzqj92xf2dzk77xpsfc4dwffvjfp8bqy685shzz1lrrfhfvq";
+    sha256 = "113vkx3dnv3fvnracszlhf56fb5jr41fr3s0bs025hv8b9sp04zz";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 319c61c893f896279d3ad2e8ef26d0026909b191 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 14:39:31 +0200
Subject: [PATCH 071/119] ragel: fix clang build

/cc ZHF #36454
---
 pkgs/development/tools/parsing/ragel/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 66895fb7fd3e..6b497e456300 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -20,7 +20,7 @@ let
 
       configureFlags = [ "--with-colm=${colm}" ];
 
-      NIX_CFLAGS_COMPILE = "-std=gnu++98";
+      NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-std=gnu++98";
 
       doCheck = true;
 

From 1d3f24be2b81fbac340c75688f9d7b931578c3d2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 25 Mar 2018 07:56:15 -0500
Subject: [PATCH 072/119] emacsPackagesNg: lower priority of elpaPackages

Lowering the priority of melpaStablePackages (#36423) leaves elpaPackages ahead
of melpaPackages; the former carries outdated dependencies which should be
overridden by melpaPackages.

See also: #36423
---
 pkgs/top-level/emacs-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index fbad836bc1ba..acc087108c98 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -385,9 +385,9 @@ let
 in
   lib.makeScope newScope (self:
     {}
+    // elpaPackages self
     // melpaStablePackages self
     // melpaPackages self
-    // elpaPackages self
     // orgPackages self
     // packagesFun self
   )

From 713ff855e074c300c7921fcf01757ffc38e9e01a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 15:03:05 +0200
Subject: [PATCH 073/119] runit: mark linux only

/cc ZHF #36454
---
 pkgs/tools/system/runit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 7eced6973731..aa2f50f2df07 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     homepage = http://smarden.org/runit;
     maintainers = with maintainers; [ rickynils joachifm ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 11aae21cf8c874be9a4dfa6bf86e8898264f522a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 25 Mar 2018 15:07:27 +0200
Subject: [PATCH 074/119] mp3blaster: fix darwin build

/cc ZHF #36454
---
 pkgs/applications/audio/mp3blaster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix
index ed7a4e786f07..eb5aa7c036cc 100644
--- a/pkgs/applications/audio/mp3blaster/default.nix
+++ b/pkgs/applications/audio/mp3blaster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, libvorbis }:
+{ stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }:
 stdenv.mkDerivation rec {
 
   version = "3.2.6";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     ncurses
     libvorbis
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin SDL;
 
   buildFlags = [ "CXXFLAGS=-Wno-narrowing" ];
 

From 7ccbca6010453263e8436994c50dae8570a5a096 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 25 Mar 2018 14:35:40 +0200
Subject: [PATCH 075/119] opencv3: don't download ippicv if not enabled

On aarch64 ipp is not available but the derivation still tries to download it
leading to an error that the platform is not supported.

There is already an option to enable ipp which is disabled by default.
So the sensitive thing to do is to only download the ippicv package if
the option is enabled.

This makes opencv3 build on aarch64.
---
 pkgs/development/libraries/opencv/3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 101b38d6305b..efb9a7cdbe43 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -167,7 +167,7 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure =
-    installExtraFiles ippicv + (
+    lib.optionalString enableIpp (installExtraFiles ippicv) + (
     lib.optionalString buildContrib ''
       cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/opencv_contrib")
 

From e52250b33c85ab3eb30325b0141ca16ed2cdbc5a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 15:23:49 +0200
Subject: [PATCH 076/119] scowl: fix darwin build

/cc ZHF #36454
---
 pkgs/data/misc/scowl/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix
index 5e4d17bcc8fd..e54dc3fa9feb 100644
--- a/pkgs/data/misc/scowl/default.nix
+++ b/pkgs/data/misc/scowl/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix, singleWordlist ? null}:
+{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix
+, singleWordlist ? null
+}:
+
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "scowl";
@@ -11,10 +14,15 @@ stdenv.mkDerivation rec {
     sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz";
   };
 
-  buildInputs = [];
-  nativeBuildInputs = [unzip zip perl aspell dos2unix];
+  postPatch = ''
+    substituteInPlace scowl/src/Makefile \
+        --replace g++ c++
+  '';
 
-  NIX_CFLAGS_COMPILE = " -Wno-narrowing ";
+  nativeBuildInputs = [ unzip zip perl aspell dos2unix ];
+  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+
+  NIX_CFLAGS_COMPILE = "-Wno-narrowing";
 
   preConfigure = ''
     patchShebangs .
@@ -34,8 +42,8 @@ stdenv.mkDerivation rec {
   installPhase = if singleWordlist == null then ''
     eval "$preInstall"
 
-    mkdir -p "$out/share/scowl" 
-    mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell" 
+    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"

From 3ca8b20328ca6aebe15e6356be2c2249c2a5a67f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 15:33:36 +0200
Subject: [PATCH 077/119] shairplay: fix darwin build

/cc ZHF #36454
---
 pkgs/servers/shairplay/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/shairplay/default.nix b/pkgs/servers/shairplay/default.nix
index 33e2f39280ad..f9b17b947cf5 100644
--- a/pkgs/servers/shairplay/default.nix
+++ b/pkgs/servers/shairplay/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # the build will fail without complaining about a reference to /tmp
-  preFixup = ''
+  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
     patchelf \
       --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}:$out/lib" \
       $out/bin/shairplay

From bec461a35ac10a4c8bc796df840722b785db3a44 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 25 Mar 2018 16:39:10 +0300
Subject: [PATCH 078/119] llvm_34, llvm_35: Disable on aarch64

https://hydra.nixos.org/build/71176565
https://hydra.nixos.org/build/71167754
---
 pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +-
 pkgs/development/compilers/llvm/3.5/llvm.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 27047e7d941c..30f2dba28831 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -90,6 +90,6 @@ in stdenv.mkDerivation rec {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 00b2548d56e6..4d0cb8930f57 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
   };
 }
 

From be3449200d8e6460cfd9d989c9843db43205c193 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 25 Mar 2018 15:50:26 +0200
Subject: [PATCH 079/119] haskellPackages.shell-conduit: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 47768b948ffa..4db43dac1436 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -112,7 +112,13 @@ self: super: {
     # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
     # see: https://github.com/psibi/shell-conduit/issues/12
     doCheck = !pkgs.stdenv.isDarwin;
-  }));
+  })).overrideScope (self: super: {
+    # shell-conduit doesn't build with conduit 1.3
+    # see https://github.com/psibi/shell-conduit/issues/15
+    conduit = self.conduit_1_2_13_1;
+    conduit-extra = self.conduit-extra_1_2_3_2;
+    resourcet = self.resourcet_1_1_11;
+  });
 
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;

From 19fa3a5e53156dc4a2e6502430dc9ebc99787d76 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 25 Mar 2018 16:13:37 +0200
Subject: [PATCH 080/119] gogs: 0.11.29 -> 0.11.34

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

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index a86a7f96e097..508c8b3fb6de 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "0.11.29";
+  version = "0.11.34";
 
   src = fetchFromGitHub {
     owner = "gogits";
     repo = "gogs";
     rev = "v${version}";
-    sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0";
+    sha256 = "15xwcw3k7wbahdgp796gly79qkka21p7kvm84zfjgcsjjri0kdnz";
   };
 
   patches = [ ./static-root-path.patch ];

From 3301258190101c6b771c70490b1e66db3e758cd3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 25 Mar 2018 16:36:22 +0200
Subject: [PATCH 081/119] swftools: fix darwin build

/cc ZHF #36454
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0aaca158c0bc..8de01dff6133 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8219,7 +8219,9 @@ with pkgs;
 
   swfmill = callPackage ../tools/video/swfmill { };
 
-  swftools = callPackage ../tools/video/swftools { };
+  swftools = callPackage ../tools/video/swftools {
+    stdenv = gccStdenv;
+  };
 
   tcptrack = callPackage ../development/tools/misc/tcptrack { };
 

From d27f7942b7ab745c5a00a993e2316c46654117d1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 25 Mar 2018 18:29:21 +0300
Subject: [PATCH 082/119] nixos/tests/misc: Fix on aarch64

The psmouse module is for PS/2 mouse only, which doesn't exist outside
x86. But we can test for the mousedev module just as well which is used
for the '-device usb-tablet' emulated by QEMU.
---
 nixos/tests/misc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 4fd9466dc502..179c95e76436 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -96,7 +96,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
       $machine->succeed("systemctl start systemd-udev-settle.service");
       subtest "udev-auto-load", sub {
           $machine->waitForUnit('systemd-udev-settle.service');
-          $machine->succeed('lsmod | grep psmouse');
+          $machine->succeed('lsmod | grep mousedev');
       };
 
       # Test whether systemd-tmpfiles-clean works.

From 4308403c303f45d47bd85643261e27cc74dd47cb Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 25 Mar 2018 17:56:06 +0200
Subject: [PATCH 083/119] ptlib: fix build

patch typedef clashes with unixODBC>=2.3.5
---
 pkgs/development/libraries/ptlib/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index f980a14aa41d..ae60a6f69d63 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -24,12 +24,16 @@ stdenv.mkDerivation rec {
     (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3;
       sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0";
     })
-    (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/gcc-5_support;
-      sha256 = "0pf2yj0150r4cnc6nv65mclrm3dillqh1xjk7m6gsjnk9b96i5d4";
-    })
     ./ptlib-2.10.11-glibc-2.26.patch
   ];
 
+  # fix typedef clashes with unixODBC>=2.3.5
+  postPatch = ''
+    substituteInPlace include/ptlib/unix/ptlib/contain.h \
+      --replace "typedef uintptr_t    UINT" "typedef unsigned int    UINT" \
+      --replace "typedef wchar_t                 WCHAR" "typedef unsigned short          WCHAR"
+  '';
+
   meta = with stdenv.lib; {
     description = "Portable Tools from OPAL VoIP";
     maintainers = [ maintainers.raskin ];

From 6f463fa7d10cd4210341647e946cccab45500db9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 07:34:08 -0700
Subject: [PATCH 084/119] accounts-qt: 1.13 -> 1.15

- Built on NixOS
- ran `/nix/store/790jpjbv7n4ccfwbnp2hpxi6xnh0rp4m-accounts-qt-1.15/bin/accountstest --help` got 0 exit code
- ran `/nix/store/790jpjbv7n4ccfwbnp2hpxi6xnh0rp4m-accounts-qt-1.15/bin/accountstest --help` and found version 1.15
- found 1.15 with grep in /nix/store/790jpjbv7n4ccfwbnp2hpxi6xnh0rp4m-accounts-qt-1.15
- directory tree listing: https://gist.github.com/5d6d729f133d93d11e63e456638fd32e
---
 pkgs/development/libraries/accounts-qt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index e7a90e405489..a50c92924e9a 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "accounts-qt-${version}";
-  version = "1.13";
+  version = "1.15";
 
   src = fetchFromGitLab {
-    sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
-    rev = version;
+    sha256 = "0cnra7g2mcgzh8ykrj1dpb4khkx676pzdr4ia1bvsp0cli48691w";
+    rev = "VERSION_${version}";
     repo = "libaccounts-qt";
     owner = "accounts-sso";
   };

From ea9c748aa415fbb077dbaae0b850f1858427b3ce Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 18:41:46 -0700
Subject: [PATCH 085/119] mysql_jdbc: 5.1.45 -> 5.1.46

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/81178700485a613e552bedbac7095177
---
 pkgs/servers/sql/mysql/jdbc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 7125f9ef8e96..66e62b823d9a 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, ant, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "mysql-connector-java-5.1.45";
+  name = "mysql-connector-java-5.1.46";
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip";
-    sha256 = "1x3dygygj15p7zk825mqr0g80wlm3rfsqgbqnb11l133rk4s1ylw";
+    sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
   };
 
   buildInputs = [ unzip ant ];

From 5fd613599fea4692f43f15152014d2f95f202474 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 19:39:18 -0700
Subject: [PATCH 086/119] networkmanager_strongswan: 1.4.1 -> 1.4.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.3 with grep in /nix/store/y2jkp10za0xpb7slalbfp3qyh9sgls70-NetworkManager-strongswan-1.4.3
- directory tree listing: https://gist.github.com/3d79a64230389ed5f84ff788ad4c56f1
---
 pkgs/tools/networking/network-manager/strongswan.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index 4fc9c904f5f9..cfa304901b48 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name    = "${pname}-${version}";
   pname   = "NetworkManager-strongswan";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchurl {
     url    = "https://download.strongswan.org/NetworkManager/${name}.tar.bz2";
-    sha256 = "0r5j8cr4x01d2cdy970990292n7p9v617cw103kdczw646xwcxs8";
+    sha256 = "0jzl52wmh2q2djb1s546kxliy7s6akhi5bx6rp2ppjfk3wbi2a2l";
   };
 
   postPatch = ''

From 74907512e14c3ea6ace8256c2ef622fe5e7f4da1 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 01:05:37 -0700
Subject: [PATCH 087/119] pam_krb5: 4.7 -> 4.8

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.8 with grep in /nix/store/lbmm10zm3yif6n33xvw5irzhzsqkwk7b-pam-krb5-4.8
- directory tree listing: https://gist.github.com/8511cb10102508ce5701ed7e0830e60c
---
 pkgs/os-specific/linux/pam_krb5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
index 3f8c3c28f317..76dbbf1e1be4 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pam, kerberos }:
 
 stdenv.mkDerivation rec {
-  name = "pam-krb5-4.7";
+  name = "pam-krb5-4.8";
 
   src = fetchurl {
     url = "http://archives.eyrie.org/software/kerberos/${name}.tar.gz";
-    sha256 = "04klg9a2rhdz0a2dw4f0ybcm28vcbab6lrynwq7rm4sn0hnzakwv";
+    sha256 = "0j96jfaxzkj1ifc3qxagjmaxvgda7ndqaaxx2ka018is9f5lbfrs";
   };
 
   buildInputs = [ pam kerberos ];

From 642b62d61d7956324715ba266d1548dbf5616d4a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 22:31:59 -0700
Subject: [PATCH 088/119] oniguruma: 6.6.1 -> 6.7.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.7.1 with grep in /nix/store/adypaqqfpnmali0662725r7xdzgyqqh0-onig-6.7.1
- directory tree listing: https://gist.github.com/b40671987a847be6597a16cb977ff6a4
---
 pkgs/development/libraries/oniguruma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index b82f137ec6d7..974c2e482ea5 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "onig-${version}";
-  version = "6.6.1";
+  version = "6.7.1";
 
   src = fetchFromGitHub {
     owner = "kkos";
     repo = "oniguruma";
     rev = "v${version}";
-    sha256 = "062g5443dyxsraq346panfqvbd6wal6nmb336n4dw1rszx576sxz";
+    sha256 = "07xbx4f3h1aqvy6587xbr8fgcn679ph3bd86pp144y0agzw0d0q2";
   };
 
   nativeBuildInputs = [ cmake ];

From fc68b01b7737b114d480c3898e241c7e2760ec1e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 09:57:28 -0700
Subject: [PATCH 089/119] xpraGtk3: 2.1.3 -> 2.2.5

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/xpra -h` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/xpra --help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/xpra --version` and found version 2.2.5
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/udev_product_version -h` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/udev_product_version --help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/udev_product_version help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/..xpra-wrapped-wrapped -h` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/..xpra-wrapped-wrapped --help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/..xpra-wrapped-wrapped --version` and found version 2.2.5
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/.xpra-wrapped -h` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/.xpra-wrapped --help` got 0 exit code
- ran `/nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5/bin/.xpra-wrapped --version` and found version 2.2.5
- found 2.2.5 with grep in /nix/store/raq8vylxav1gm8v4gsphfmpbq6mw9362-xpra-2.2.5
- directory tree listing: https://gist.github.com/78f0907352399b3a9966fb6f71f1f0d4
---
 pkgs/tools/X11/xpra/gtk3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index 629c10f867fa..7e620e0c2c81 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -7,11 +7,11 @@
 
 buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.1.3";
+  version = "2.2.5";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm";
+    sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
   };
 
   patchPhase = ''

From f3231c6ba487ba60d1d71bc8eecd18ce77c0041f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 09:07:38 -0700
Subject: [PATCH 090/119] gitAndTools.git-open: 1.3.1 -> 2.0.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.0 with grep in /nix/store/bl1bdnjxn6k22is2w6qvdjl7kvhzjv2s-git-open-2.0.0
- directory tree listing: https://gist.github.com/7c26064e56c054ea6ba2b4d9162267cd
---
 .../version-management/git-and-tools/git-open/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
index 5272e2be07cf..dc3fbbed1995 100644
--- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-open-${version}";
-  version = "1.3.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-open";
     rev = "v${version}";
-    sha256 = "1klj41vqgyyigqzi6s1ykz9vd8wvaq3skin63pi989dlsjf7igyr";
+    sha256 = "0lprzrjsqrg83gixfaiw26achgd8l7s56jknsjss4p7y0w1fxm05";
   };
 
   buildInputs = [ makeWrapper ];

From 5350a56dcf4b65d848c876efeb104e6c33c32cbb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 01:03:25 -0700
Subject: [PATCH 091/119] libcec_platform: 2.0.1 -> 2.1.0.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.1.0.1 with grep in /nix/store/klb1bvsf1az785f2jzvsg5g0sxs8g4l3-p8-platform-2.1.0.1
- directory tree listing: https://gist.github.com/be00d099a69bdff53bd6e138cf5d6877
---
 pkgs/development/libraries/libcec/platform.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix
index 228dccea3e39..0005525a7cd2 100644
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake }:
 
-let version = "2.0.1"; in
+let version = "2.1.0.1"; in
 
 stdenv.mkDerivation {
   name = "p8-platform-${version}";
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
-    sha256 = "1kslq24p2zams92kc247qcczbxb2n89ykk9jfyiilmwh7qklazp9";
+    sha256 = "18381y54f7d18ckpzf9cfxbz1ws6imprbbm9pvhcg5c86ln8skq6";
   };
 
   nativeBuildInputs = [ cmake ];

From 4b19ab9635faec6221eb097d1fc879969c62f27c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 17:08:38 -0700
Subject: [PATCH 092/119] m17n_lib: 1.7.0 -> 1.8.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv -h` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv --help` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv help` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-conv --version` and found version 1.8.0
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-date -h` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-date --help` got 0 exit code
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-date --version` and found version 1.8.0
- ran `/nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0/bin/m17n-config --version` and found version 1.8.0
- found 1.8.0 with grep in /nix/store/28baccpjkyg7rb0alf8j2hpnczz22jzq-m17n-lib-1.8.0
- directory tree listing: https://gist.github.com/3d3a5a6fc658c968ce3a1298c9f32c56
---
 pkgs/tools/inputmethods/m17n-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
index 982f35a9fe68..12b669c87777 100644
--- a/pkgs/tools/inputmethods/m17n-lib/default.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, m17n_db}:
 stdenv.mkDerivation rec {
-  name = "m17n-lib-1.7.0";
+  name = "m17n-lib-1.8.0";
 
   src = fetchurl {
     url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
-    sha256 = "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f";
+    sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq";
   };
 
   buildInputs = [ m17n_db ];

From 2455478754f6757e0648e8c8a276da45b0b4fa1c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 15 Mar 2018 17:13:02 +0000
Subject: [PATCH 093/119] ocamlPackages.findlib: fix META for library `threads`

---
 pkgs/development/tools/ocaml/findlib/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 186b78ce3f36..997a81f889e3 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, m4, ncurses, ocaml, writeText}:
+{ stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
 
 stdenv.mkDerivation rec {
   name = "ocaml-findlib-${version}";
@@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [m4 ncurses ocaml];
 
-  patches = [ ./ldconf.patch ./install_topfind.patch ];
+  patches = [ ./ldconf.patch ./install_topfind.patch
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch";
+      sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3";
+    })
+  ];
 
   dontAddPrefix=true;
 

From 387d7916637ae4b0e71d54fbcbd58b6c416f3709 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 15 Mar 2018 17:19:31 +0000
Subject: [PATCH 094/119] ocamlPackages.findlib: automatically populate the
 CAML_LD_LIBRARY_PATH env. variable

With directories of the form:
  lib/ocaml/${ocaml.version}/site-lib/stubslibs
---
 pkgs/development/tools/ocaml/findlib/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 997a81f889e3..6f136a7ef289 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
         if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then
             export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/"
         fi
+        if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"; then
+            export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"
+        fi
         export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/"
         if test -n "$createFindlibDestdir"; then
           mkdir -p $OCAMLFIND_DESTDIR

From ef4a5e2fc0fa7e795cffd052e52267ff0515b634 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 25 Mar 2018 16:50:06 +0000
Subject: [PATCH 095/119] gnome2.gtksourceview: fix build on Darwin

---
 pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 05da06846418..9efca75e8f87 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -38,4 +38,6 @@ stdenv.mkDerivation rec {
   preConfigure = optionalString stdenv.isDarwin ''
     intltoolize --force
   '';
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 }

From fa4956d091e18d15c196b1aac0fbe6111a199260 Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Fri, 23 Mar 2018 03:49:15 +0700
Subject: [PATCH 096/119] ahoviewer: 1.4.9 -> 1.5.0

---
 pkgs/applications/graphics/ahoviewer/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index b7647803b3d3..5abe1931d339 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "ahoviewer-${version}";
-  version = "1.4.9";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "ahodesuka";
     repo = "ahoviewer";
     rev = version;
-    sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx";
+    sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig";
   };
 
   enableParallelBuilding = true; 
@@ -20,9 +20,13 @@ stdenv.mkDerivation rec {
                   libsecret curl unrar libzip librsvg 
                   gst_all_1.gstreamer
                   gst_all_1.gst-plugins-good 
-                  gst_all_1.gst-plugins-bad 
                   gst_all_1.gst-libav
                   gst_all_1.gst-plugins-base ];
+
+  # https://github.com/ahodesuka/ahoviewer/issues/60
+  # Already fixed in the master branch
+  # TODO: remove this next release
+  makeFlags = [ ''LIBS=-lssl -lcrypto'' ];
   
   postPatch = ''patchShebangs version.sh'';
   

From c276b454769999e94a543df0fc3c53be632394e5 Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Sun, 25 Mar 2018 14:33:41 +0700
Subject: [PATCH 097/119] ahoviewer: add useUnrar option

---
 .../graphics/ahoviewer/default.nix            | 32 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 5abe1931d339..5fb7e0078065 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -1,6 +1,10 @@
-{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, 
-  gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip,
-  librsvg, gst_all_1, autoreconfHook, makeWrapper }:
+{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig,
+  gtkmm2, glibmm, libxml2, libsecret, curl, libzip,
+  librsvg, gst_all_1, autoreconfHook, makeWrapper,
+  useUnrar ? false, unrar
+}:
+
+assert useUnrar -> unrar != null;
 
 stdenv.mkDerivation rec {
   name = "ahoviewer-${version}";
@@ -13,23 +17,25 @@ stdenv.mkDerivation rec {
     sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig";
   };
 
-  enableParallelBuilding = true; 
-  
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
-  buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2
-                  libsecret curl unrar libzip librsvg 
-                  gst_all_1.gstreamer
-                  gst_all_1.gst-plugins-good 
-                  gst_all_1.gst-libav
-                  gst_all_1.gst-plugins-base ];
+  buildInputs = [
+    glibmm libconfig gtkmm2 glibmm libxml2
+    libsecret curl libzip librsvg
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-base
+  ] ++ stdenv.lib.optional useUnrar unrar;
 
   # https://github.com/ahodesuka/ahoviewer/issues/60
   # Already fixed in the master branch
   # TODO: remove this next release
   makeFlags = [ ''LIBS=-lssl -lcrypto'' ];
-  
+
   postPatch = ''patchShebangs version.sh'';
-  
+
   postInstall = ''
     wrapProgram $out/bin/ahoviewer \
     --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8de01dff6133..6847c309cafc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14644,7 +14644,9 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
-  ahoviewer = callPackage ../applications/graphics/ahoviewer { };
+  ahoviewer = callPackage ../applications/graphics/ahoviewer {
+    useUnrar = config.ahoviewer.useUnrar or false;
+  };
 
   airwave = callPackage ../applications/audio/airwave/default.nix { };
 

From 001db3951d2817af4707bb87eef2536bd445cfd4 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 25 Mar 2018 18:58:46 +0200
Subject: [PATCH 098/119] opal: build with gcc6

build on gcc7 failed with
"Error: call of overloaded 'abs(unsigned int)' is ambiguous"
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8de01dff6133..f6faf9b15c94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10809,6 +10809,7 @@ with pkgs;
 
   opal = callPackage ../development/libraries/opal {
     ffmpeg = ffmpeg_2;
+    stdenv = overrideCC stdenv gcc6;
   };
 
   openh264 = callPackage ../development/libraries/openh264 { };

From 18d3088ba8c8f6b0e1fe051291af25cfe6bc0cf2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 19:30:51 +0200
Subject: [PATCH 099/119] haskell-either: drop obsolete override for ghc-8.4.x

Closes https://github.com/NixOS/nixpkgs/issues/37773.
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d953236784ee..ed39896863b4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -66,11 +66,6 @@ self: super: {
     doCheck         = false;
   });
 
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## free >=4.9 && <5
-  either = super.either_5;
-
   ## Needs bump to a versioned attribute
   ## Setup: Encountered missing dependencies:
   ## Cabal <2.2

From 784dd64e8a61c5c84181f46c5a28f68e7e72261e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 19:35:35 +0200
Subject: [PATCH 100/119] hackage2nix: disable broken builds

The following maintained builds fail (since quite some time):

 - network-arbitrary and network-uri-json (@alunduil)
 - pipes-csv (@jb55)
---
 .../haskell-modules/configuration-hackage2nix.yaml   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 00505f31b462..d4b39c119551 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2474,7 +2474,6 @@ package-maintainers:
     - bson-lens
     - cased
     - elm-export-persistent
-    - pipes-csv
     - pipes-mongodb
     - skeletons
     - streaming-wai
@@ -2492,9 +2491,6 @@ package-maintainers:
     - shakespeare
   abbradar:
     - Agda
-  alunduil:
-    - network-arbitrary
-    - network-uri-json
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
@@ -3509,6 +3505,7 @@ dont-distribute-packages:
   clash-vhdl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  classy-miso:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-parallel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-dot-com:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6505,6 +6502,7 @@ dont-distribute-packages:
   lmdb-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  load-font:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   located-monad-logger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6990,6 +6988,7 @@ dont-distribute-packages:
   network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-anonymous-i2p:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-api-support:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-arbitrary:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bitcoin:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bytestring:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7008,6 +7007,7 @@ dont-distribute-packages:
   network-stream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-topic-models:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-transport-amqp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-uri-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-uri-static:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-voicetext:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-wai-router:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7107,6 +7107,7 @@ dont-distribute-packages:
   octohat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  odbc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   OddWord:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oden-go-packages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   odpic-raw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7372,6 +7373,7 @@ dont-distribute-packages:
   pipes-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-courier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-csv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-fastx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8523,6 +8525,7 @@ dont-distribute-packages:
   stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-benchmarks:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-concurrency:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-osm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9175,6 +9178,7 @@ dont-distribute-packages:
   wai-middleware-preprocessor:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-route:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-verbs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-routes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]

From 8446b031c48a4fbc6b0532822874fa4f52c8defb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 Mar 2018 02:30:40 +0100
Subject: [PATCH 101/119] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6272b092cf23aa30154cd90ab0f5786c69bceb17.
---
 .../haskell-modules/hackage-packages.nix      | 1600 +++++++++++++----
 1 file changed, 1242 insertions(+), 358 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ac04f2d7ceaa..cfe1a0cca178 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6178,6 +6178,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
 
+  "GLURaw_2_0_0_4" = callPackage
+    ({ mkDerivation, base, libGL, libGLU, OpenGLRaw, transformers }:
+     mkDerivation {
+       pname = "GLURaw";
+       version = "2.0.0.4";
+       sha256 = "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq";
+       libraryHaskellDepends = [ base OpenGLRaw transformers ];
+       librarySystemDepends = [ libGL libGLU ];
+       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) libGL; inherit (pkgs) libGLU;};
+
   "GLUT" = callPackage
     ({ mkDerivation, array, base, containers, OpenGL, StateVar
      , transformers
@@ -6196,6 +6210,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GLUT_2_7_0_13" = callPackage
+    ({ mkDerivation, array, base, containers, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "GLUT";
+       version = "2.7.0.13";
+       sha256 = "1j5sv95fy0fv1n57qxhkdqm20q0lj4h5x3r7php9jh70wl77q89x";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers OpenGL StateVar transformers
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A binding for the OpenGL Utility Toolkit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw
@@ -8653,6 +8686,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HStringTemplate_0_8_7" = callPackage
+    ({ mkDerivation, array, base, blaze-builder, bytestring, containers
+     , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
+     , semigroups, syb, template-haskell, text, time, void
+     }:
+     mkDerivation {
+       pname = "HStringTemplate";
+       version = "0.8.7";
+       sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring containers deepseq directory
+         filepath mtl old-locale parsec pretty semigroups syb
+         template-haskell text time void
+       ];
+       description = "StringTemplate implementation in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HStringTemplateHelpers" = callPackage
     ({ mkDerivation, base, containers, directory, FileManipCompat
      , filepath, HSH, HStringTemplate, mtl, safe, strict
@@ -13979,6 +14031,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "OpenGL_3_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
+     , OpenGLRaw, StateVar, text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGL";
+       version = "3.0.2.1";
+       sha256 = "1gsrlp2if5zwq0icjmsmva3cj719qpwagsmg6dlvps0xj4dqkjvs";
+       libraryHaskellDepends = [
+         base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
+         text transformers
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "OpenGLCheck" = callPackage
     ({ mkDerivation, base, checkers, haskell98, OpenGL, QuickCheck }:
      mkDerivation {
@@ -15778,6 +15848,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Rasterific_0_7_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+     , free, JuicyPixels, mtl, primitive, transformers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "Rasterific";
+       version = "0.7.3";
+       sha256 = "0y92h3mjsr1vjcxc06lh1lvszicf53l1bzdaci5mjb5gmiq8f2px";
+       libraryHaskellDepends = [
+         base bytestring containers dlist FontyFruity free JuicyPixels mtl
+         primitive transformers vector vector-algorithms
+       ];
+       description = "A pure haskell drawing engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ReadArgs" = callPackage
     ({ mkDerivation, base, hspec, system-filepath, text }:
      mkDerivation {
@@ -16581,10 +16669,8 @@ self: {
      }:
      mkDerivation {
        pname = "SciFlow";
-       version = "0.6.0";
-       sha256 = "1b57sa2gx3jj00239sq62qmywjykc80lkk587lwzrdp9w5ycl4sb";
-       revision = "1";
-       editedCabalFile = "1nsakdi9y5nnwm8x9f2a1cvf55k0wnva3wkd9nmz9my8mlk2jfi3";
+       version = "0.6.1";
+       sha256 = "0axwf7rdwhl3ppq6qlxrffzbzbwvb8q0ygpnlzc2yvksiqzp9h2g";
        libraryHaskellDepends = [
          aeson base bytestring cereal cereal-text containers
          data-default-class directory exceptions executable-path fgl
@@ -23132,8 +23218,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "1.1.2";
-       sha256 = "15ixv4zzb03wiijx5g7l9csawfihklsh1jnphnwb6j8d1kpmmh5v";
+       version = "1.2";
+       sha256 = "092jril2vfi90bbi9wc2ir4gidqzq0w84mgbgz72icx63nni1ah0";
        libraryHaskellDepends = [
          aivika aivika-transformers array base binary containers
          distributed-process exceptions mtl mwc-random random stm time
@@ -27949,6 +28035,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apply-refact_0_5_0_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filemanip, filepath
+     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
+     , silently, syb, tasty, tasty-expected-failure, tasty-golden
+     , temporary, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "apply-refact";
+       version = "0.5.0.0";
+       sha256 = "1bvlbchpma3vlxfvjbyd01rmzqc9h5q3my9n7v3wal2p7ysvjpqz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filemanip ghc ghc-exactprint mtl process
+         refact syb temporary transformers unix-compat
+       ];
+       executableHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact syb temporary transformers
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact silently syb tasty
+         tasty-expected-failure tasty-golden temporary transformers
+         unix-compat
+       ];
+       description = "Perform refactorings specified by the refact library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apportionment" = callPackage
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
@@ -28340,19 +28458,18 @@ self: {
      }) {};
 
   "argon2" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, tasty
-     , tasty-quickcheck, text, transformers
+    ({ mkDerivation, base, bytestring, deepseq, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text-short
      }:
      mkDerivation {
        pname = "argon2";
-       version = "1.2.0";
-       sha256 = "1zzwlhb47ykqi6psgnpzmf4nlk5rwr4adpl7sz7x7iacy9xmayd5";
-       libraryHaskellDepends = [ base bytestring text transformers ];
+       version = "1.3.0.0";
+       sha256 = "0sszifmi74b2n19d4f5f30pfnivqm6n1jdwf2j402schkd1wz7cp";
+       libraryHaskellDepends = [ base bytestring deepseq text-short ];
        testHaskellDepends = [
-         base bytestring QuickCheck tasty tasty-quickcheck text
+         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/ocharles/argon2.git";
-       description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function";
+       description = "Memory-hard password hash and proof-of-work function";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -30085,27 +30202,27 @@ self: {
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
      , Cabal, cli-setup, composition-prelude, containers, dependency
      , dhall, directory, file-embed, filemanip, hashable, http-client
-     , http-client-tls, lens, lzma, mtl, optparse-applicative
-     , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary
-     , text, unix, zip-archive, zlib
+     , http-client-tls, lzma, microlens, microlens-th, mtl
+     , optparse-applicative, parallel-io, process, shake, shake-ats
+     , shake-ext, tar, temporary, text, unix, zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.7.1.0";
-       sha256 = "0lpyvcj5cki19fs9022yb1wzwis6a89f3i4s03rcll0lvshmxd2q";
+       version = "2.7.1.2";
+       sha256 = "0v519jzz8sh851jp3rcbzgh5ylr8ggk993svh4w6y4224y6wfi28";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring bzlib Cabal
          composition-prelude containers dependency dhall directory
-         file-embed filemanip hashable http-client http-client-tls lens lzma
-         mtl parallel-io process shake shake-ats shake-ext tar text unix
-         zip-archive zlib
+         file-embed filemanip hashable http-client http-client-tls lzma
+         microlens microlens-th mtl parallel-io process shake shake-ats
+         shake-ext tar text unix zip-archive zlib
        ];
        executableHaskellDepends = [
-         base composition-prelude directory lens optparse-applicative shake
-         shake-ats temporary text
+         base composition-prelude directory microlens optparse-applicative
+         shake shake-ats temporary text
        ];
        homepage = "https://github.com/vmchale/atspkg#readme";
        description = "A build tool for ATS";
@@ -31371,22 +31488,25 @@ self: {
      }) {};
 
   "aws-easy" = callPackage
-    ({ mkDerivation, amazonka, amazonka-core, base, bytestring, lens
-     , resourcet, template-haskell, text
+    ({ mkDerivation, amazonka, amazonka-dynamodb, amazonka-s3, base
+     , bytestring, lens, resourcet, split, template-haskell, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "aws-easy";
-       version = "0.1.0.0";
-       sha256 = "0lchj79l606a2wxh72g837ys3nb1628ps03wxm61s5fl49229c0w";
+       version = "0.1.0.1";
+       sha256 = "0sl3whg7x02c3cph5p72rlkycsr2m3ni0kad5rs0q644wgvhqvm5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         amazonka amazonka-core base bytestring lens resourcet
-         template-haskell text
+         amazonka base bytestring lens resourcet template-haskell
+       ];
+       executableHaskellDepends = [
+         amazonka amazonka-dynamodb amazonka-s3 base lens split text
+         unordered-containers
        ];
-       executableHaskellDepends = [ base ];
        homepage = "https://github.com/rcook/aws-easy#readme";
-       description = "AWS Easy: Helper functions for working with amazonka";
+       description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -31753,6 +31873,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aws-ses-easy" = callPackage
+    ({ mkDerivation, amazonka, amazonka-ses, base, criterion
+     , exceptions, lens, lucid, mtl, tasty, tasty-hspec, text
+     , text-conversions
+     }:
+     mkDerivation {
+       pname = "aws-ses-easy";
+       version = "0.1.0";
+       sha256 = "0wlwff18k1qf6n6q2bhd1n2w58nsdmqx5c1yhhfqxkjyxz9flccn";
+       libraryHaskellDepends = [
+         amazonka amazonka-ses base exceptions lens lucid mtl text
+         text-conversions
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/jxv/aws-ses-easy#readme";
+       description = "Wrapper over Amazonka's SES";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aws-sign4" = callPackage
     ({ mkDerivation, attempt, aws, base, blaze-builder, byteable
      , bytestring, bytestring-lexing, Cabal, case-insensitive
@@ -33213,8 +33353,8 @@ self: {
      }:
      mkDerivation {
        pname = "bdcs";
-       version = "0.2.1";
-       sha256 = "0zlzxh6ps655zryifyzz7pbypv32w6a475ighbc840awkw59qvvy";
+       version = "0.2.4";
+       sha256 = "1s8kbvyc73lpc634snmrb9dxmji0pj526ynnjqb4k3knia3qb3sn";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -33243,7 +33383,7 @@ self: {
        ];
        homepage = "https://github.com/weldr/bdcs";
        description = "Tools for managing a content store of software packages";
-       license = "LGPL";
+       license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ostree;};
 
@@ -35743,22 +35883,22 @@ self: {
      , bytestring-lexing, case-insensitive, clustering, conduit
      , conduit-combinators, containers, criterion, data-default-class
      , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit
-     , IntervalMap, math-functions, matrices, mtl, parallel, primitive
-     , random, split, statistics, tasty, tasty-golden, tasty-hunit, text
-     , transformers, unordered-containers, vector, vector-algorithms
-     , word8
+     , IntervalMap, lens, math-functions, matrices, mtl, parallel
+     , primitive, random, split, statistics, tasty, tasty-golden
+     , tasty-hunit, text, transformers, unordered-containers, vector
+     , vector-algorithms, word8
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.4.1";
-       sha256 = "0kqj88g1fx17xbdy6h56xl4qpgk6xvyfqwnvjvi4ha4rw7dhddxr";
+       version = "0.5.0";
+       sha256 = "1nb549w2rzc9psdnz8xbma0qgm2hj4svrlm3x8vc2i1dklmljmvr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring bytestring-lexing
          case-insensitive clustering conduit containers data-default-class
          data-ordlist double-conversion hexpat HsHTSLib http-conduit
-         IntervalMap math-functions matrices mtl parallel primitive split
-         statistics text transformers unordered-containers vector
+         IntervalMap lens math-functions matrices mtl parallel primitive
+         split statistics text transformers unordered-containers vector
          vector-algorithms word8
        ];
        testHaskellDepends = [
@@ -38581,7 +38721,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_35" = callPackage
+  "brick_0_35_1" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, stm, template-haskell, text, text-zipper
@@ -38589,8 +38729,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.35";
-       sha256 = "16vfm60nz2zx819nv4s83108w1bhiyqx99zmacrlc371nlpdiyby";
+       version = "0.35.1";
+       sha256 = "16z2gm2wvj0y4lc3z7wvdrfksx4a6przllw2ly8ymm1x4ii0khhw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38605,15 +38745,17 @@ self: {
      }) {};
 
   "brick-skylighting" = callPackage
-    ({ mkDerivation, base, brick, containers, skylighting, text, vty }:
+    ({ mkDerivation, base, brick, containers, skylighting-core, text
+     , vty
+     }:
      mkDerivation {
        pname = "brick-skylighting";
-       version = "0.1";
-       sha256 = "189qpq2cg45binlb9nq43h05g97ch56855xlz2givxw8psb0kb1i";
+       version = "0.2";
+       sha256 = "1x4kfjj4sa5gbxnbvh76b4isrmc6jr11py9b50jsyvs720plq778";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base brick containers skylighting text vty
+         base brick containers skylighting-core text vty
        ];
        homepage = "https://github.com/jtdaugherty/brick-skylighting/";
        description = "Show syntax-highlighted text in your Brick UI";
@@ -38808,6 +38950,47 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "brittany_0_10_0_0" = callPackage
+    ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
+     , containers, czipwith, data-tree-print, deepseq, directory, extra
+     , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
+     , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
+     , safe, semigroups, strict, syb, text, transformers, uniplate
+     , unsafe, yaml
+     }:
+     mkDerivation {
+       pname = "brittany";
+       version = "0.10.0.0";
+       sha256 = "1fm6l4ial8kp4mafwkp7w79nklc46c07i12p1in3dqxz9r5817r1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths monad-memo mtl multistate
+         neat-interpolation pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       executableHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+         neat-interpolation pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       testHaskellDepends = [
+         aeson base butcher bytestring cmdargs containers czipwith
+         data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+         neat-interpolation parsec pretty safe semigroups strict syb text
+         transformers uniplate unsafe yaml
+       ];
+       homepage = "https://github.com/lspitzner/brittany/";
+       description = "Haskell source code formatter";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "broadcast-chan" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -46014,6 +46197,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "classy-miso" = callPackage
+    ({ mkDerivation, base, containers, lens, megaparsec, miso
+     , network-uri, rfc, url
+     }:
+     mkDerivation {
+       pname = "classy-miso";
+       version = "0.0.0.1";
+       sha256 = "07mcxpp0brh3yh7qhzmg7vvv0kgy2gwms8mzlgvbfb608ggwh32b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers lens megaparsec miso network-uri rfc url
+       ];
+       executableHaskellDepends = [ base miso rfc ];
+       testHaskellDepends = [ base miso rfc ];
+       homepage = "https://github.com/RobertFischer/Classy-Miso#README.md";
+       description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-parallel" = callPackage
     ({ mkDerivation, base, lifted-base, monad-control, parallel
      , resourcet, transformers
@@ -49373,12 +49577,13 @@ self: {
      }) {};
 
   "composition-prelude" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, cpphs }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.3.0.4";
-       sha256 = "0dsd67ffhwfbq7y9f8c6q9nd05ayyxi85mzvc8kgj7f21cpvclmg";
+       version = "1.3.0.7";
+       sha256 = "15fi1f3yiqg1gdjlwv3a6h9np9z3v1yd1qnz47309b6qki5pb0k3";
        libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ cpphs ];
        homepage = "https://github.com/vmchale/composition-prelude#readme";
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -51497,8 +51702,8 @@ self: {
        pname = "containers-verified";
        version = "0.5.11.0";
        sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07";
-       revision = "1";
-       editedCabalFile = "12jw1aq053wbbam8n2vvfdl00yha551bbk4xnwxk9rwfday45m4j";
+       revision = "3";
+       editedCabalFile = "092g7yj27pxpap1qh4spp2yvb1y22jaca9s4x36rnkafvqn0yyl3";
        libraryHaskellDepends = [ containers ];
        homepage = "https://github.com/nomeata/containers-verified";
        description = "Formally verified drop-in replacement of containers";
@@ -54389,8 +54594,8 @@ self: {
        pname = "cryptohash-md5";
        version = "0.11.100.1";
        sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi";
-       revision = "1";
-       editedCabalFile = "1drxjsn5chi9zj3djj85s1d6xqlc28ji70zpyicxl5fals10n5w3";
+       revision = "2";
+       editedCabalFile = "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring pureMD5 tasty tasty-hunit
@@ -54410,8 +54615,8 @@ self: {
        pname = "cryptohash-sha1";
        version = "0.11.100.1";
        sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w";
-       revision = "1";
-       editedCabalFile = "167i2mjyr18949xckzv6f782n763f6w9k114p6kq74gbmxqjvmqb";
+       revision = "2";
+       editedCabalFile = "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -54454,8 +54659,8 @@ self: {
        pname = "cryptohash-sha512";
        version = "0.11.100.1";
        sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h";
-       revision = "1";
-       editedCabalFile = "0aj9ryzdpxz79n5bs5wx56s9rjxm25dm7agxbyzqdr93wi2rj8ny";
+       revision = "2";
+       editedCabalFile = "1xy1j3bn2w8my0q04s7z460rddmnqfdh43l95m86rpk75xpiryil";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -55213,8 +55418,8 @@ self: {
        pname = "cue-sheet";
        version = "1.0.1";
        sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1";
-       revision = "1";
-       editedCabalFile = "05f1w3jhwk09jaknq2ipfsfdlh95rg614m1c1diwi2z9s6hwi3cx";
+       revision = "2";
+       editedCabalFile = "09h4phhj0j1m4ab5gbfrz6475jn772x46l21k7l2qlxav6hi9w7x";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class exceptions megaparsec
@@ -60062,8 +60267,8 @@ self: {
      }:
      mkDerivation {
        pname = "dependency";
-       version = "0.1.0.9";
-       sha256 = "02xlq32xpww584ng5wzzlxmh8d15dqc342mlnfiysh2lfdwqydzk";
+       version = "0.1.0.10";
+       sha256 = "1cr1h8c127sgbgjg1qy9c17aj3mfp1bh35ypv00sz19k0d6wvmly";
        libraryHaskellDepends = [
          ansi-wl-pprint base binary containers deepseq microlens
          recursion-schemes tardis transformers
@@ -60682,20 +60887,58 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-bash" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dhall
-     , insert-ordered-containers, neat-interpolation, optparse-generic
-     , shell-escape, text, text-format, trifecta
+  "dhall_1_12_0" = callPackage
+    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , contravariant, cryptonite, deepseq, directory, exceptions
+     , filepath, formatting, haskeline, http-client, http-client-tls
+     , insert-ordered-containers, lens-family-core, memory, mtl
+     , optparse-generic, parsers, prettyprinter
+     , prettyprinter-ansi-terminal, repline, scientific, tasty
+     , tasty-hunit, text, transformers, trifecta, unordered-containers
+     , vector
      }:
      mkDerivation {
-       pname = "dhall-bash";
-       version = "1.0.10";
-       sha256 = "0phi5z7rmbxjj83mps0lcpmcv320k8mrfpigls46smv7srmhsla1";
+       pname = "dhall";
+       version = "1.12.0";
+       sha256 = "065cs20v5ps91mygvha5k5348n62vkhacqyv6fdl4m5b2hs0bkab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dhall insert-ordered-containers
-         neat-interpolation shell-escape text text-format
+         ansi-wl-pprint base base16-bytestring bytestring case-insensitive
+         containers contravariant cryptonite directory exceptions filepath
+         formatting http-client http-client-tls insert-ordered-containers
+         lens-family-core memory parsers prettyprinter
+         prettyprinter-ansi-terminal scientific text transformers trifecta
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base haskeline mtl optparse-generic prettyprinter
+         prettyprinter-ansi-terminal repline text trifecta
+       ];
+       testHaskellDepends = [
+         base deepseq insert-ordered-containers prettyprinter tasty
+         tasty-hunit text vector
+       ];
+       description = "A configuration language guaranteed to terminate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "dhall-bash" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dhall, formatting
+     , insert-ordered-containers, neat-interpolation, optparse-generic
+     , shell-escape, text, trifecta
+     }:
+     mkDerivation {
+       pname = "dhall-bash";
+       version = "1.0.11";
+       sha256 = "17jgzb43ga8ddmxjp2mliv0zx6zpy0p7m5dihijpya66g7dkm91g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers dhall formatting
+         insert-ordered-containers neat-interpolation shell-escape text
        ];
        executableHaskellDepends = [
          base bytestring dhall optparse-generic text trifecta
@@ -60725,37 +60968,55 @@ self: {
 
   "dhall-json" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , optparse-generic, text, trifecta, yaml
+     , optparse-generic, text, trifecta, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.12";
-       sha256 = "174ssff7fcxgr13w8mcls7w4fy5xzywh8qb55zj9qragj4bkyjab";
+       version = "1.0.13";
+       sha256 = "03spz9csxgamj970ha9l5swcpbkrvzbjy9w028c1kswzs806699s";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ aeson base dhall text ];
+       libraryHaskellDepends = [
+         aeson base bytestring dhall text trifecta unordered-containers
+       ];
        executableHaskellDepends = [
-         aeson aeson-pretty base bytestring dhall optparse-generic text
-         trifecta yaml
+         aeson aeson-pretty base bytestring dhall optparse-generic text yaml
        ];
        description = "Compile Dhall to JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-lex" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
+     , hspec, hspec-dirstream
+     }:
+     mkDerivation {
+       pname = "dhall-lex";
+       version = "0.1.0.1";
+       sha256 = "02g8si9cfhwqsr6c507yw7sydyg8ma645z9c3n0cap1wj8fa0r8p";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ array base bytestring deepseq ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [ base bytestring hspec hspec-dirstream ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       description = "Lexer for the Dhall language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dhall-nix" = callPackage
-    ({ mkDerivation, base, containers, data-fix, dhall, hnix
-     , insert-ordered-containers, neat-interpolation, optparse-generic
-     , scientific, text, text-format, trifecta
+    ({ mkDerivation, base, containers, data-fix, dhall, formatting
+     , hnix, insert-ordered-containers, neat-interpolation
+     , optparse-generic, scientific, text, trifecta
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.1";
-       sha256 = "01cdz8kjmm0ncdyq616mg6hjq7cwq5648cnrp6ggps5zc1d71176";
+       version = "1.1.2";
+       sha256 = "0ssb2ncycx6ayislqggf3ljnvk5xzq65g63fj658jkpmv2vh2wyj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers data-fix dhall hnix insert-ordered-containers
-         neat-interpolation scientific text text-format
+         base containers data-fix dhall formatting hnix
+         insert-ordered-containers neat-interpolation scientific text
        ];
        executableHaskellDepends = [
          base dhall hnix optparse-generic text trifecta
@@ -60769,8 +61030,8 @@ self: {
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.7";
-       sha256 = "11jp5yz11f701phzz74zf3spqhgmrdiq8ldbi96xmfjqhwnc9kmj";
+       version = "1.0.8";
+       sha256 = "05h534bsggz4jysdc4n62l3a0asqr7ba9mpsminisc76f6k5y54d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base dhall optparse-generic text ];
@@ -62288,6 +62549,8 @@ self: {
        pname = "direct-sqlite";
        version = "2.3.22";
        sha256 = "0fv90nm68k3vfj87kw6kfsvmk5kyvvrjcyp73s8m0pm6y7ypgg7a";
+       revision = "1";
+       editedCabalFile = "0cfg6fjdl1p9lgsnc2b2lys9mcc30dvxr8a92q5nxpgc4mdkk5db";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit temporary text
@@ -62297,6 +62560,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "direct-sqlite_2_3_23" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, directory
+     , HUnit, semigroups, temporary, text
+     }:
+     mkDerivation {
+       pname = "direct-sqlite";
+       version = "2.3.23";
+       sha256 = "0ywkah9gmjnx0zdlvinc2i898jsbdrw4ba315zkpijaaldp6znqz";
+       libraryHaskellDepends = [ base bytestring semigroups text ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring directory HUnit temporary text
+       ];
+       homepage = "https://github.com/IreneKnapp/direct-sqlite";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "directed-cubical" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , parallel, QuickCheck, unordered-containers, vector
@@ -64083,14 +64364,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "doctest-discover_0_1_0_8" = callPackage
+  "doctest-discover_0_1_0_9" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
      }:
      mkDerivation {
        pname = "doctest-discover";
-       version = "0.1.0.8";
-       sha256 = "1ilmrc173d5xr7yphrbgg4kmkilyj1a89c67q4zrs4b6xfd5pa2x";
+       version = "0.1.0.9";
+       sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70361,6 +70642,8 @@ self: {
        pname = "except-exceptions";
        version = "0.1";
        sha256 = "03d94arrq8ynkbchv8w2vp4q3wka81hkrmkll6bd9p5kwhq28nzs";
+       revision = "1";
+       editedCabalFile = "09i2w1ry7vmjc0a4d05a4hs7kdj3brn5jrxsy638f6acj41g5dhk";
        libraryHaskellDepends = [ base exceptions transformers ];
        homepage = "https://github.com/thumphries/except-exceptions";
        description = "Safely deal with exceptions in ExceptT";
@@ -71300,6 +71583,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extra_1_6_5" = callPackage
+    ({ mkDerivation, base, clock, directory, filepath, process
+     , QuickCheck, time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.6.5";
+       sha256 = "05x89gclm8vw1rx4945p3asmsa28055y81nwzvgq91yr5qc4lbgi";
+       libraryHaskellDepends = [
+         base clock directory filepath process time unix
+       ];
+       testHaskellDepends = [ base directory filepath QuickCheck unix ];
+       homepage = "https://github.com/ndmitchell/extra#readme";
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extract-dependencies" = callPackage
     ({ mkDerivation, async, base, Cabal, containers
      , package-description-remote
@@ -79546,6 +79847,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generics-eot_0_3" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hspec
+     , hspec-discover, interpolate, markdown-unlit, mockery, QuickCheck
+     , shake
+     }:
+     mkDerivation {
+       pname = "generics-eot";
+       version = "0.3";
+       sha256 = "1r0qh27jpika9wfxk0i6kywsclrdqhaphl1qw26vfzka4dsfbjrb";
+       libraryHaskellDepends = [ base markdown-unlit ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec interpolate markdown-unlit
+         mockery QuickCheck shake
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/soenkehahn/generics-eot#readme";
+       description = "A library for generic programming that aims to be easy to understand";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generics-sop" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
      mkDerivation {
@@ -82900,8 +83222,8 @@ self: {
      }:
      mkDerivation {
        pname = "giphy-api";
-       version = "0.5.2.0";
-       sha256 = "1sbwv6mvjb17g95b1b1ggryhk6lykp2vwvxja3y6z9rjzb9i2wa4";
+       version = "0.6.0.1";
+       sha256 = "0146813vcnjgb8clyczlz8g6ngm9l702gib60f2m6rf2bc0bbpwd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83679,6 +84001,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "githud" = callPackage
+    ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, unix
+     }:
+     mkDerivation {
+       pname = "githud";
+       version = "2.0.1";
+       sha256 = "0qmc51dpsmil72xvv3g7mylr39ignrm8az6jv92b767s8ijqk5lh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl parsec process text unix ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "http://github.com/gbataille/gitHUD#readme";
+       description = "More efficient replacement to the great git-radar";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gitignore" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , http-conduit, network, safe, text
@@ -86941,6 +87283,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-oauth2-easy" = callPackage
+    ({ mkDerivation, aeson, base, criterion, http-api-data, http-client
+     , mtl, servant, servant-client, tasty, tasty-hspec, text
+     , text-conversions, unordered-containers
+     }:
+     mkDerivation {
+       pname = "google-oauth2-easy";
+       version = "0.0.0";
+       sha256 = "03jzlshz7649rvgmql5nsq4hys253dlqpm163xqpccif1s34z59b";
+       libraryHaskellDepends = [
+         aeson base http-api-data http-client mtl servant servant-client
+         text text-conversions unordered-containers
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/jxv/google-oauth2-easy#readme";
+       description = "Opininated use of Google Authentication for ease";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "google-oauth2-for-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath
      , hspec, http-types, req, time, unix, wai, warp
@@ -87568,8 +87930,8 @@ self: {
      }:
      mkDerivation {
        pname = "grammatical-parsers";
-       version = "0.2.2";
-       sha256 = "0l1zjgn4jix9m2zbiwnms3c6004zqzpqxwvsdq9fmafbh7zhfvvx";
+       version = "0.3";
+       sha256 = "1dqmjg40h4gm6921yq84sx8x5sdbzhnv8xl7m2ylb872ddbzfwg3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87579,8 +87941,8 @@ self: {
          base containers monoid-subclasses parsers rank2classes
        ];
        testHaskellDepends = [
-         base checkers doctest monoid-subclasses parsers QuickCheck
-         rank2classes tasty tasty-quickcheck testing-feat
+         base checkers containers doctest monoid-subclasses parsers
+         QuickCheck rank2classes tasty tasty-quickcheck testing-feat
        ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq monoid-subclasses rank2classes
@@ -91526,8 +91888,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.6.0";
-       sha256 = "1ajwzyh3x185lvn22vi3wnfprf9fq0k1kxjxz575h87xwnq46y4v";
+       version = "1.6.1";
+       sha256 = "1fh9gg8yq0k5a54bk754kcbrmna0v66c7wnmd9z20f46wl3cdygs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92175,12 +92537,15 @@ self: {
      }) {};
 
   "hakyll-dir-list" = callPackage
-    ({ mkDerivation, base, containers, filepath, hakyll }:
+    ({ mkDerivation, base, containers, data-default, filepath, hakyll
+     }:
      mkDerivation {
        pname = "hakyll-dir-list";
-       version = "0.1.1.0";
-       sha256 = "0j5amghlsjdnvi4klag6ifwwzy05v17bsf7j6lzl32hcx66a62qb";
-       libraryHaskellDepends = [ base containers filepath hakyll ];
+       version = "1.0.0.1";
+       sha256 = "1xlb6dkkzska20gxjsazh5wipb4srpl9llg338znrj2491h37kqh";
+       libraryHaskellDepends = [
+         base containers data-default filepath hakyll
+       ];
        homepage = "http://github.com/freylax/hakyll-dir-list";
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
@@ -94497,6 +94862,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashtables_1_2_3_0" = callPackage
+    ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
+     mkDerivation {
+       pname = "hashtables";
+       version = "1.2.3.0";
+       sha256 = "19bkpx43f3b5mya4jkygiafw402hvazawp6qr69h3wqkc6xv8mpr";
+       libraryHaskellDepends = [
+         base ghc-prim hashable primitive vector
+       ];
+       homepage = "http://github.com/gregorycollins/hashtables";
+       description = "Mutable hash tables in the ST monad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashtables-plus" = callPackage
     ({ mkDerivation, base, criterion-plus, deepseq, hashable
      , hashtables, lens, loch-th, mtl, mwc-random, placeholders
@@ -95606,16 +95986,16 @@ self: {
      }) {};
 
   "haskell-packages" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers
      , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl
      , optparse-applicative, tagged, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "haskell-packages";
-       version = "0.5";
-       sha256 = "0b6hzz5ql6c9x7lxdldi50yw257cccp4d26jbdp51fi5chp2h7y6";
+       version = "0.6.1";
+       sha256 = "16lsk6djhy34k9clmaqsqrd4277dk7nva77djs91h0nl68zz3hhs";
        libraryHaskellDepends = [
-         aeson base bytestring Cabal containers deepseq directory filepath
+         base binary bytestring Cabal containers deepseq directory filepath
          haskell-src-exts hse-cpp mtl optparse-applicative tagged
          transformers transformers-compat
        ];
@@ -97565,20 +97945,20 @@ self: {
 
   "hasktags" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json
-     , unix, utf8-string
+     , utf8-string
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.69.4";
-       sha256 = "1s7phsg20h15p2dnri6viy5k6c4n42gchy684dv3r30qrwwvv0ni";
+       version = "0.69.5";
+       sha256 = "0jln0r3dzd7g17avxqgnyxzv4nmqlmqaw41vrysb838yql6g6ns8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory filepath json unix utf8-string
+         base bytestring directory filepath json utf8-string
        ];
-       executableHaskellDepends = [ base directory filepath unix ];
+       executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
-         base bytestring directory filepath HUnit json unix utf8-string
+         base bytestring directory filepath HUnit json utf8-string
        ];
        homepage = "http://github.com/MarcWeber/hasktags";
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
@@ -97745,6 +98125,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasmin_1_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, directory, doctest, doctest-discover, gitrev, hopfli
+     , hspec, hspec-attoparsec, matrix, mtl, numbers
+     , optparse-applicative, parsers, QuickCheck, quickcheck-instances
+     , text
+     }:
+     mkDerivation {
+       pname = "hasmin";
+       version = "1.0.2";
+       sha256 = "13cblc4jcn88w00rsb72dqhiy18mfph388407vm3k6kbg5zxg1d9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base 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 quickcheck-instances 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 {
@@ -100893,6 +101303,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "heterogeneous-list-literals" = callPackage
+    ({ mkDerivation, base, OneTuple }:
+     mkDerivation {
+       pname = "heterogeneous-list-literals";
+       version = "0.1.0.1";
+       sha256 = "0cb38kpw01fzwfrhlgi2l1869b8hd9cd7kzbyr1ap6ik5gkljq6k";
+       libraryHaskellDepends = [ base OneTuple ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/davidm-d/heterogeneous-list-literals";
+       description = "Allows the use of tuples as literals for Heterogeneous collections";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "heterolist" = callPackage
     ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata
      }:
@@ -103507,32 +103930,30 @@ self: {
   "hledger-iadd" = callPackage
     ({ mkDerivation, base, brick, containers, directory, free
      , hledger-lib, hspec, megaparsec, microlens, microlens-th
-     , optparse-applicative, QuickCheck, semigroups, text, text-format
-     , text-zipper, time, transformers, unordered-containers, vector
-     , vty, xdg-basedir
+     , optparse-applicative, QuickCheck, semigroups, text, text-zipper
+     , time, transformers, unordered-containers, vector, vty
+     , xdg-basedir
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.3.1";
-       sha256 = "0z7f9bm7xkq8a9kbhf3bd6fxhfaab08ddgghpbg5z460l4lhcczv";
-       revision = "2";
-       editedCabalFile = "03cc91bzxmk3hffkmda3w87rgwarpdjbs1kwafix65avhw03g7ga";
+       version = "1.3.2";
+       sha256 = "1n21i1hqqrzd3fdrq6cclf8bfginwl4bhjy16vxfh9ba644920xf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base brick containers directory free hledger-lib megaparsec
          microlens microlens-th optparse-applicative semigroups text
-         text-format text-zipper time transformers unordered-containers
-         vector vty xdg-basedir
+         text-zipper time transformers unordered-containers vector vty
+         xdg-basedir
        ];
        executableHaskellDepends = [
          base brick directory free hledger-lib megaparsec microlens
-         optparse-applicative text text-format text-zipper time transformers
+         optparse-applicative text text-zipper time transformers
          unordered-containers vector vty xdg-basedir
        ];
        testHaskellDepends = [
-         base free hledger-lib hspec megaparsec QuickCheck text text-format
-         text-zipper time transformers vector
+         base free hledger-lib hspec megaparsec QuickCheck text text-zipper
+         time transformers vector
        ];
        homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
        description = "A terminal UI as drop-in replacement for hledger add";
@@ -103580,29 +104001,29 @@ self: {
      , blaze-markup, bytestring, cmdargs, containers, csv, data-default
      , Decimal, deepseq, directory, doctest, extra, filepath, Glob
      , hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec
-     , pretty-show, regex-tdfa, safe, semigroups, split, test-framework
+     , pretty-show, regex-tdfa, safe, split, test-framework
      , test-framework-hunit, text, time, transformers, uglymemo
      , utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.5";
-       sha256 = "00k0wqib3hadi4rcnldr14q2va57b09whfbwzd14pz824x7pnfd7";
+       version = "1.5.1";
+       sha256 = "1bk2haj555fd6dws3zcp2a4slkhnl7wfjkx1x654a6nrdywlny3x";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory extra
          filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec
-         pretty-show regex-tdfa safe semigroups split text time transformers
-         uglymemo utf8-string
+         pretty-show regex-tdfa safe split text time transformers uglymemo
+         utf8-string
        ];
        testHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory
          doctest extra filepath Glob hashtables HUnit megaparsec mtl
-         mtl-compat old-time parsec pretty-show regex-tdfa safe semigroups
-         split test-framework test-framework-hunit text time transformers
-         uglymemo utf8-string
+         mtl-compat old-time parsec pretty-show regex-tdfa safe split
+         test-framework test-framework-hunit text time transformers uglymemo
+         utf8-string
        ];
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
@@ -103774,6 +104195,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsass;};
 
+  "hlibsass_0_1_7_0" = callPackage
+    ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
+     mkDerivation {
+       pname = "hlibsass";
+       version = "0.1.7.0";
+       sha256 = "0vcz3hndksfp9rmz07y67rvqinaz7cxzvrhjcwy30wc79m25r9v2";
+       configureFlags = [ "-fexternalLibsass" ];
+       setupHaskellDepends = [ base Cabal directory ];
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ libsass ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/jakubfijalkowski/hlibsass";
+       description = "Low-level bindings to Libsass";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libsass;};
+
   "hlint" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, data-default, directory, extra, filepath
@@ -103783,8 +104221,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1";
-       sha256 = "13chm0dhh1fn2iy3flnh7ahc3yzh8q0v10qxwd1739sywhykayg9";
+       version = "2.1.1";
+       sha256 = "0mmfavd158l5ig5wb1b1zbhbraj8hhqvbk4mg85n6c8ndpr4grd4";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -107904,20 +108342,19 @@ self: {
   "hs2ats" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
      , cpphs, criterion, deepseq, haskell-src-exts, hspec
-     , hspec-dirstream, language-ats, lens, optparse-generic
+     , hspec-dirstream, language-ats, microlens, optparse-generic
      , system-filepath
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.2.1.7";
-       sha256 = "01hinvxj9v04kzvyck01z4ky3b1gmffwxvl7wri2ggps26h2d5gf";
+       version = "0.2.1.8";
+       sha256 = "19hrl7qrhg9h2m5anzgxf6sfx7zr0a4r14mvjcn21cvj1jzs9j86";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base casing composition-prelude cpphs deepseq
-         haskell-src-exts language-ats lens optparse-generic
+         haskell-src-exts language-ats microlens optparse-generic
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base hspec hspec-dirstream system-filepath
        ];
@@ -108032,6 +108469,30 @@ self: {
        pname = "hsass";
        version = "0.5.0";
        sha256 = "07jhny061fnxqiijr2rqac85qzlxz24w8dms5pn844as8nkwdi4d";
+       revision = "1";
+       editedCabalFile = "00va8x51p6rbg8jbkxpyz74pa2pfm5dsrpi57icbyickx39iaydd";
+       libraryHaskellDepends = [
+         base bytestring data-default-class filepath hlibsass monad-loops
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring data-default-class hspec hspec-discover temporary
+       ];
+       homepage = "https://github.com/jakubfijalkowski/hsass";
+       description = "Integrating Sass into Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hsass_0_6_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, filepath
+     , hlibsass, hspec, hspec-discover, monad-loops, temporary
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hsass";
+       version = "0.6.0";
+       sha256 = "14wvgcp9skdqag16fvbbkfmimpxbm9y2hh9g6alacxasan8qjn6j";
        libraryHaskellDepends = [
          base bytestring data-default-class filepath hlibsass monad-loops
          transformers
@@ -108760,8 +109221,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.3.1.2";
-       sha256 = "1abwv4987xznfv6sx8sfhk04f4s7dpjvgzwzjzi8rwxibm8az09p";
+       version = "0.3.1.3";
+       sha256 = "1xrggdkaq3b1vsnkrcsm2ji6wcrmxv53lf8x3ki7py9blgjj3vrj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109922,8 +110383,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-dirstream";
-       version = "0.4.0.0";
-       sha256 = "01090ph0njwv5cabj9f82xsiy0lk254sk3iq6l9h7dkh57sm7q9n";
+       version = "1.0.0.0";
+       sha256 = "0xj7qj6j3mp1j3q4pdm0javjc4rw586brcd399ygh74vpa669pgf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base dirstream filepath hspec hspec-core pipes pipes-safe
@@ -112550,6 +113011,8 @@ self: {
        pname = "http-media";
        version = "0.7.1.2";
        sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy";
+       revision = "1";
+       editedCabalFile = "0lxlig3mhw52ixqq65c9fzawviia2fl00d7hn1diny964h8klwgc";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers utf8-string
        ];
@@ -125386,12 +125849,12 @@ self: {
     ({ mkDerivation, base, containers, mtl, read-bounded }:
      mkDerivation {
        pname = "lambda-options";
-       version = "0.9.0.1";
-       sha256 = "16q4skxkmc6xaj23ys5ddpazwcxvck7dvvilm8n4k0wam0llhs2h";
+       version = "0.9.1.0";
+       sha256 = "0rylch5v4lpd5ynyhrzzj72npqdv6q8mp2rx9v7p641r0njw5r5n";
        libraryHaskellDepends = [ base containers mtl read-bounded ];
        homepage = "https://github.com/thomaseding/lambda-options";
-       description = "A modern command-line parser for Haskell";
-       license = "unknown";
+       description = "Declarative command line parser using type-driven pattern matching";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -126107,17 +126570,17 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, criterion, deepseq, happy, hspec
-     , hspec-dirstream, lens, recursion-schemes, system-filepath
-     , transformers
+     , hspec-dirstream, microlens, microlens-th, recursion-schemes
+     , system-filepath, transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.2";
-       sha256 = "1hbngljls19a9mr6gz5qm80ibx8z75ky0s5gn57nmlsf8pazkfvz";
+       version = "1.2.0.3";
+       sha256 = "19gm7gj6l0b4qh5pnp1qv1q2g3gfp3mny9y8nrxvmbzrrc1ad7j9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         lens recursion-schemes transformers
+         microlens microlens-th recursion-schemes transformers
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
@@ -126338,26 +126801,22 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_3_0_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, filepath, free
-     , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
-     , semigroups, split, template-haskell, text, th-lift
-     , th-lift-instances, time, transformers, unordered-containers, yaml
+  "language-docker_4_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
+     , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split
+     , template-haskell, text, th-lift, time
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "3.0.1";
-       sha256 = "1bs9ghajxz0a1jmzarb7fzn4z2m8qmcyydsf93rqlzxc8y8fhsp2";
+       version = "4.0.1";
+       sha256 = "0z1jifvinq90qh4106azd6ss80ds5p8acvl8x73j4zmqpn2d95xa";
        libraryHaskellDepends = [
-         aeson base bytestring directory filepath free Glob mtl parsec
-         pretty semigroups split template-haskell text th-lift
-         th-lift-instances time transformers unordered-containers yaml
+         base bytestring free mtl parsec pretty split template-haskell text
+         th-lift time
        ];
        testHaskellDepends = [
-         aeson base bytestring directory filepath free Glob hspec HUnit mtl
-         parsec pretty process QuickCheck semigroups split template-haskell
-         text th-lift th-lift-instances time transformers
-         unordered-containers yaml
+         base bytestring directory filepath free Glob hspec HUnit mtl parsec
+         pretty process QuickCheck split template-haskell text th-lift time
        ];
        homepage = "https://github.com/hadolint/language-docker#readme";
        description = "Dockerfile parser, pretty-printer and embedded DSL";
@@ -128315,6 +128774,48 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "lens_4_16_1" = callPackage
+    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
+     , Cabal, cabal-doctest, call-stack, comonad, containers
+     , contravariant, criterion, deepseq, directory, distributive
+     , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
+     , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors
+     , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
+     , tagged, template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, text
+     , th-abstraction, transformers, transformers-compat
+     , unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "lens";
+       version = "4.16.1";
+       sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm";
+       setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
+       libraryHaskellDepends = [
+         array base base-orphans bifunctors bytestring call-stack comonad
+         containers contravariant distributive exceptions filepath free
+         ghc-prim hashable kan-extensions mtl parallel profunctors
+         reflection semigroupoids semigroups tagged template-haskell text
+         th-abstraction transformers transformers-compat
+         unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory doctest filepath
+         generic-deriving HUnit mtl nats parallel QuickCheck semigroups
+         simple-reflect test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring comonad containers criterion deepseq
+         generic-deriving transformers unordered-containers vector
+       ];
+       homepage = "http://github.com/ekmett/lens/";
+       description = "Lenses, Folds and Traversals";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, lens }:
      mkDerivation {
@@ -132017,8 +132518,8 @@ self: {
      }:
      mkDerivation {
        pname = "lmdb-simple";
-       version = "0.3.1.0";
-       sha256 = "1d43gss6ri05rnjsjfmaxpzb91gfvnjhz41ls7rjmqa1x8ym2lsn";
+       version = "0.4.0.0";
+       sha256 = "1bq8zdym2x1yyzafyyw2syn9pg4w33y107qyrid67492zmck10zi";
        libraryHaskellDepends = [ base bytestring lmdb serialise ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -132112,6 +132613,7 @@ self: {
        homepage = "https://github.com/deech/load-font#load-font";
        description = "A cross platform library for loading bundled fonts into your application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loadavg" = callPackage
@@ -134667,8 +135169,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "4.0.1.0";
-       sha256 = "08nw11l8vpazyfny3f8alyb9r268wlh3q24032q34sk1n5d92pcl";
+       version = "4.0.2.0";
+       sha256 = "1syq92bxbyf5nxywpm1prds9ki63a601v55cjba1dalv3z2zh6n6";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -136541,8 +137043,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "40700.0.0";
-       sha256 = "1knf05p9qmk51ysvp2gp718d365g9n7myycb07w8d84f4vrphg51";
+       version = "40800.0.0";
+       sha256 = "0wzgy39halqd6bm0wvcsnk4l5ngdr4nwqbqk46jgnfb99nwsd3z6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136571,20 +137073,21 @@ self: {
   "mattermost-api" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, connection
      , containers, gitrev, hashable, HTTP, HUnit, memory, microlens
-     , microlens-th, mtl, network-uri, pretty-show, process, stm, tasty
-     , tasty-hunit, template-haskell, text, time, unordered-containers
-     , websockets
+     , microlens-th, mtl, network-uri, pretty-show, process
+     , resource-pool, stm, tasty, tasty-hunit, template-haskell, text
+     , time, unordered-containers, websockets
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "40700.0.0";
-       sha256 = "1nhhlj6vgjndm34aw9kzmsjrkx7j3fir8rccx65d4c10labclsb9";
+       version = "40800.0.0";
+       sha256 = "0yjs97c4rf2idj88y5gnkdvshlaz49zna1ssx1d910gm5b5cnqy5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary bytestring connection containers gitrev hashable
          HTTP memory microlens microlens-th network-uri pretty-show process
-         stm template-haskell text time unordered-containers websockets
+         resource-pool stm template-haskell text time unordered-containers
+         websockets
        ];
        testHaskellDepends = [
          aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit
@@ -136601,8 +137104,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "40700.0.0";
-       sha256 = "0dz254wmrxbavsjqhyn90gg6iplcgcpsw8p9fv0c5kxlafqwg0kf";
+       version = "40800.0.0";
+       sha256 = "1j9f291s51a8i55y338kcvfkmlb3xsd0c4cjh0nl97x7p30dxcm6";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -138284,12 +138787,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microlens_0_4_9" = callPackage
+  "microlens_0_4_9_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.4.9";
-       sha256 = "1zsisv6vlkphqw8rdi6c6phm6k3izc0n6vj1z1b6my7r8zyshlia";
+       version = "0.4.9.1";
+       sha256 = "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
@@ -138446,14 +138949,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microlens-th_0_4_2" = callPackage
+  "microlens-th_0_4_2_1" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell
      , th-abstraction, transformers
      }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.4.2";
-       sha256 = "16962h9qxjw6mv7nqn2xz7kclfgllla52illrzpri738wnf2nwsd";
+       version = "0.4.2.1";
+       sha256 = "0hpwwk50a826s87ad0k6liw40qp6av0hmdhnsdfhhk5mka710mzc";
        libraryHaskellDepends = [
          base containers microlens template-haskell th-abstraction
          transformers
@@ -139722,6 +140225,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmorph_1_1_2" = callPackage
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+     mkDerivation {
+       pname = "mmorph";
+       version = "1.1.2";
+       sha256 = "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9";
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
+       description = "Monad morphisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmtf" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, data-msgpack
      , hspec, QuickCheck, text
@@ -140599,6 +141116,8 @@ self: {
        pname = "monad-logger";
        version = "0.3.28.2";
        sha256 = "1dqrsqpqw4qfyida4j0z6dffds4sj7j282x4ir6wrq9j7nmns4yx";
+       revision = "1";
+       editedCabalFile = "1mk69zg6bbh0420ndf5f0qgsdzy11mn0pdcqgyna4r0pqkzflc0i";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra exceptions fast-logger
          lifted-base monad-control monad-loops mtl resourcet stm stm-chans
@@ -140610,6 +141129,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_28_3" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , exceptions, fast-logger, lifted-base, monad-control, monad-loops
+     , mtl, resourcet, stm, stm-chans, template-haskell, text
+     , transformers, transformers-base, transformers-compat
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.28.3";
+       sha256 = "11v5014zqp1sl801wc39yyix8m30vrf3ibas28bcdjyfrbhhvskp";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra exceptions fast-logger
+         lifted-base monad-control monad-loops mtl resourcet stm stm-chans
+         template-haskell text transformers transformers-base
+         transformers-compat unliftio-core
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -141245,12 +141787,12 @@ self: {
      }) {};
 
   "monad-var" = callPackage
-    ({ mkDerivation, base, stm, transformers }:
+    ({ mkDerivation, base, base-compat, stm }:
      mkDerivation {
        pname = "monad-var";
-       version = "0.1.2.0";
-       sha256 = "1nj10lhijwvim7js2vl9b9qq7x55dx7bk6q4jmvpz99c2vqfhyy5";
-       libraryHaskellDepends = [ base stm transformers ];
+       version = "0.2.1.0";
+       sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88";
+       libraryHaskellDepends = [ base base-compat stm ];
        homepage = "https://github.com/effectfully/monad-var#readme";
        description = "Generic operations over variables";
        license = stdenv.lib.licenses.bsd3;
@@ -145839,25 +146381,25 @@ self: {
     ({ mkDerivation, attoparsec, base, errors, exceptions
      , extractable-singleton, hashable, hspec, hspec-wai, http-types
      , monad-control-aligned, mtl, poly-arity, pred-trie, regex-compat
-     , tasty, tasty-hspec, text, tries, unordered-containers
+     , tasty, tasty-hspec, text, tries, unordered-containers, wai
      , wai-middleware-content-type, wai-middleware-verbs
      , wai-transformers
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "9.0.0";
-       sha256 = "1vdmwkr69n7ybwamfazy2p65r9s2fqbgvfy31wxiqyn6phg6r57v";
+       version = "9.0.0.1";
+       sha256 = "1y9562nq2hylcd0ahc28cfb9q1bsl4dg8ilrdsy64ls776dkj951";
        libraryHaskellDepends = [
          attoparsec base errors exceptions extractable-singleton hashable
          monad-control-aligned mtl poly-arity pred-trie regex-compat text
-         tries unordered-containers wai-middleware-content-type
+         tries unordered-containers wai wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
        testHaskellDepends = [
          attoparsec base errors exceptions extractable-singleton hashable
          hspec hspec-wai http-types monad-control-aligned mtl poly-arity
          pred-trie regex-compat tasty tasty-hspec text tries
-         unordered-containers wai-middleware-content-type
+         unordered-containers wai wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
        homepage = "https://github.com/athanclark/nested-routes#readme";
@@ -146277,6 +146819,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "netwire_5_0_3" = callPackage
+    ({ mkDerivation, base, containers, deepseq, parallel, profunctors
+     , random, semigroups, time, transformers
+     }:
+     mkDerivation {
+       pname = "netwire";
+       version = "5.0.3";
+       sha256 = "0bi2xyipz11vsai4wghdrh5yywzl0bkinfpmh0qdp77y7qlygpgi";
+       libraryHaskellDepends = [
+         base containers deepseq parallel profunctors random semigroups time
+         transformers
+       ];
+       homepage = "https://github.com/esoeylemez/netwire";
+       description = "Functional reactive programming library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "netwire-input" = callPackage
     ({ mkDerivation, base, deepseq, netwire }:
      mkDerivation {
@@ -146495,7 +147055,7 @@ self: {
        homepage = "https://github.com/alunduil/network-arbitrary";
        description = "Arbitrary Instances for Network Types";
        license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ alunduil ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-attoparsec" = callPackage
@@ -146762,6 +147322,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-info_0_2_0_10" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "network-info";
+       version = "0.2.0.10";
+       sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/jystic/network-info";
+       description = "Access the local computer's basic network configuration";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-interfacerequest" = callPackage
     ({ mkDerivation, base, bytestring, ioctl, network }:
      mkDerivation {
@@ -147274,7 +147847,7 @@ self: {
        homepage = "https://github.com/alunduil/network-uri-json";
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ alunduil ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-uri-static" = callPackage
@@ -147539,6 +148112,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "newtype-generics_0_5_3" = callPackage
+    ({ mkDerivation, base, criterion, hspec, hspec-discover, semigroups
+     , transformers
+     }:
+     mkDerivation {
+       pname = "newtype-generics";
+       version = "0.5.3";
+       sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base hspec ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion semigroups ];
+       homepage = "http://github.com/sjakobi/bsb-http-chunked";
+       description = "A typeclass and set of functions for working with newtypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "newtype-th" = callPackage
     ({ mkDerivation, base, haskell-src-meta, newtype, syb
      , template-haskell
@@ -149411,38 +150002,39 @@ self: {
      }) {};
 
   "nvim-hs" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal
-     , cereal-conduit, conduit, conduit-extra, containers, data-default
-     , deepseq, directory, dyre, exceptions, filepath, foreign-store
-     , hslogger, hspec, hspec-discover, HUnit, lifted-base, megaparsec
-     , messagepack, monad-control, mtl, network, optparse-applicative
-     , process, QuickCheck, resourcet, setenv, stm, streaming-commons
-     , template-haskell, text, time, time-locale-compat, transformers
-     , transformers-base, utf8-string
+    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+     , containers, data-default, deepseq, directory, dyre, filepath
+     , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec
+     , messagepack, mtl, network, optparse-applicative, prettyprinter
+     , prettyprinter-ansi-terminal, process, QuickCheck, resourcet
+     , setenv, stm, streaming-commons, template-haskell, text, time
+     , time-locale-compat, transformers, transformers-base, unliftio
+     , unliftio-core, utf8-string, void
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "0.2.4";
-       sha256 = "16zfaps34r6dbjrvrj1a08sndv8nxqhnwy4vgl1flnc6q6xbi7f5";
+       version = "1.0.0.0";
+       sha256 = "036zf20aarrshqh0vpkmba5fj5sz28q0cd92dhxag12lp3zsindf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default deepseq directory dyre
-         exceptions filepath foreign-store hslogger lifted-base megaparsec
-         messagepack monad-control mtl network optparse-applicative process
-         resourcet setenv stm streaming-commons template-haskell text time
-         time-locale-compat transformers transformers-base utf8-string
+         base bytestring cereal cereal-conduit conduit containers
+         data-default deepseq directory dyre filepath foreign-store hslogger
+         megaparsec messagepack mtl network optparse-applicative
+         prettyprinter prettyprinter-ansi-terminal process resourcet setenv
+         stm streaming-commons template-haskell text time time-locale-compat
+         transformers transformers-base unliftio unliftio-core utf8-string
+         void
        ];
        executableHaskellDepends = [ base data-default ];
        testHaskellDepends = [
-         ansi-wl-pprint base bytestring cereal cereal-conduit conduit
-         conduit-extra containers data-default directory dyre exceptions
-         filepath foreign-store hslogger hspec hspec-discover HUnit
-         lifted-base megaparsec messagepack mtl network optparse-applicative
+         base bytestring cereal cereal-conduit conduit containers
+         data-default directory dyre filepath foreign-store hslogger hspec
+         hspec-discover HUnit megaparsec messagepack mtl network
+         optparse-applicative prettyprinter prettyprinter-ansi-terminal
          process QuickCheck resourcet setenv stm streaming-commons
          template-haskell text time time-locale-compat transformers
-         transformers-base utf8-string
+         transformers-base unliftio unliftio-core utf8-string
        ];
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
@@ -149451,23 +150043,24 @@ self: {
      }) {};
 
   "nvim-hs-contrib" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, data-default
-     , directory, exceptions, filepath, hspec, hspec-discover
-     , messagepack, mtl, nvim-hs, QuickCheck, text, time, utf8-string
-     , yaml
+    ({ mkDerivation, base, bytestring, data-default, directory
+     , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs
+     , prettyprinter, prettyprinter-ansi-terminal, QuickCheck, text
+     , time, utf8-string, yaml
      }:
      mkDerivation {
        pname = "nvim-hs-contrib";
-       version = "0.2.0";
-       sha256 = "05999ma4whng6brn37bw2wbw7yf2hq9yw8sr12kwykdygxvykrbf";
+       version = "1.0.0.0";
+       sha256 = "150kg8gkai4cz7yv42vgn3b6rl6p44vfksq897kjaa3b12yjwd5x";
        libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring data-default directory exceptions
-         filepath messagepack mtl nvim-hs text time utf8-string yaml
+         base bytestring data-default directory filepath messagepack mtl
+         nvim-hs prettyprinter prettyprinter-ansi-terminal text time
+         utf8-string yaml
        ];
        testHaskellDepends = [
          base hspec hspec-discover nvim-hs QuickCheck
        ];
-       homepage = "https://github.com/neovimhaskell/nvim-hs";
+       homepage = "https://github.com/neovimhaskell/nvim-hs-contrib";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149475,15 +150068,16 @@ self: {
 
   "nvim-hs-ghcid" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers, yaml
+     , ghcid, nvim-hs, nvim-hs-contrib, resourcet, transformers
+     , unliftio, yaml
      }:
      mkDerivation {
        pname = "nvim-hs-ghcid";
-       version = "0.2.0";
-       sha256 = "108fi3pnsc0yj5kmm0awqr7f3xqhyxg1yg29p2kw6bk8vvwjdlvf";
+       version = "1.0.0.0";
+       sha256 = "06yz73sx2z86dm1yhs3pqpi8g88157885fpm8hd6gkl2q4pjcwc8";
        libraryHaskellDepends = [
          base bytestring containers directory filepath ghcid nvim-hs
-         nvim-hs-contrib resourcet transformers yaml
+         nvim-hs-contrib resourcet transformers unliftio yaml
        ];
        homepage = "https://github.com/saep/nvim-hs-ghcid";
        description = "Neovim plugin that runs ghcid to update the quickfix list";
@@ -149954,15 +150548,32 @@ self: {
          inherit (pkgs.xorg) libXinerama; ovr = null; systemd = null;};
 
   "odbc" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , formatting, hspec, optparse-applicative, QuickCheck, text, time
+     , unixODBC, unliftio-core, weigh
+     }:
      mkDerivation {
        pname = "odbc";
-       version = "0.0.0";
-       sha256 = "1yyp21j0kmq7mc80z3vpmra16kbqb35pzblir1gppiz0wh1wmgpb";
-       doHaddock = false;
-       description = "TBA";
+       version = "0.0.1";
+       sha256 = "173ixmhw505306qg3ig3xvi16h30fk5314yk5mbmmv212k2w2vrp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers deepseq formatting text time
+         unliftio-core
+       ];
+       librarySystemDepends = [ unixODBC ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec QuickCheck text time
+       ];
+       benchmarkHaskellDepends = [ async base text weigh ];
+       description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) unixODBC;};
 
   "oden-go-packages" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
@@ -156628,6 +157239,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistable-record_0_6_0_3" = callPackage
+    ({ mkDerivation, array, base, containers, dlist, names-th
+     , product-isomorphic, quickcheck-simple, template-haskell
+     , th-data-compat, transformers
+     }:
+     mkDerivation {
+       pname = "persistable-record";
+       version = "0.6.0.3";
+       sha256 = "12arj395b1famyy0hxp394ci2y3mkly68i82a26p67g5dpmdm466";
+       libraryHaskellDepends = [
+         array base containers dlist names-th product-isomorphic
+         template-haskell th-data-compat transformers
+       ];
+       testHaskellDepends = [ base quickcheck-simple ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Binding between SQL database values and haskell records";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistable-types-HDBC-pg" = callPackage
     ({ mkDerivation, base, bytestring, convertible, HDBC
      , persistable-record, relational-query-HDBC, text-postgresql
@@ -158714,7 +159345,7 @@ self: {
        ];
        description = "Fast, streaming csv parser";
        license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-errors" = callPackage
@@ -162168,18 +162799,18 @@ self: {
 
   "potoki" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bytestring
-     , directory, foldl, hashable, potoki-core, profunctors, QuickCheck
-     , quickcheck-instances, random, rerebase, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers, unagi-chan
+     , directory, foldl, hashable, potoki-core, profunctors, ptr
+     , QuickCheck, quickcheck-instances, random, rerebase, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.11.1";
-       sha256 = "1xmxdlg213y1v09akc853zymbkxpg6pkfspwjb0g1kvnirjlj0rj";
+       version = "0.11.2";
+       sha256 = "1c07q872d6k75cah1rfjw7wfam76fn8dc4x265v0xrngys6k9iwh";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
-         potoki-core profunctors text transformers unagi-chan
+         potoki-core profunctors ptr text transformers unagi-chan
          unordered-containers vector
        ];
        testHaskellDepends = [
@@ -162229,6 +162860,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "potoki-hasql" = callPackage
+    ({ mkDerivation, base, bytestring, hasql, potoki, potoki-core
+     , profunctors, text, vector
+     }:
+     mkDerivation {
+       pname = "potoki-hasql";
+       version = "1.1";
+       sha256 = "03bssi3qdayrxrsy5ykf38r5kbl0m5svfm76k4yrwcpzpqk5h0sh";
+       libraryHaskellDepends = [
+         base bytestring hasql potoki potoki-core profunctors text vector
+       ];
+       homepage = "https://github.com/metrix-ai/potoki-hasql";
+       description = "Integration of \"potoki\" and \"hasql\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "potrace" = callPackage
     ({ mkDerivation, base, bindings-potrace, bytestring, containers
      , data-default, JuicyPixels, vector
@@ -162655,6 +163302,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "predicate-class" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "predicate-class";
+       version = "0.1.0.1";
+       sha256 = "03rw51jpfcl827nrv1fxlghqwg0mk89l1rkqwd743lnsydwzi15h";
+       libraryHaskellDepends = [ base ];
+       description = "Helper class for passing context along a predicate value";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "predicates" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -165956,8 +166614,8 @@ self: {
      }:
      mkDerivation {
        pname = "pure-zlib";
-       version = "0.6.1";
-       sha256 = "0dqc35ca1668j2xfwmz8bqgbyld9gw3b0bld8s5gy6id7qfn7d26";
+       version = "0.6.2";
+       sha256 = "022ciqcsw39wi4r577q92s9awjwkc2da61ljqi8n5qsal83vhayh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166803,16 +167461,15 @@ self: {
 
   "qr-imager" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
-     , either, haskell-qrencode, hspec, jose-jwt, JuicyPixels
-     , libqrencode, microlens, optparse-applicative, process, split
-     , vector
+     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode
+     , microlens, optparse-applicative, process, split, vector
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "1.0.1.6";
-       sha256 = "0kc69xkqinvwk7hxblxkspnmj422c1pbdig9kvh3r8sj1in0lpmn";
+       version = "1.0.1.7";
+       sha256 = "1l0xf77nkx8kv9xc07xlpg09b76isr3c8k7i03lfa3dgn9s6lh7l";
        libraryHaskellDepends = [
-         aeson base bytestring cryptonite directory either haskell-qrencode
+         aeson base bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels microlens optparse-applicative process split
          vector
        ];
@@ -167158,8 +167815,8 @@ self: {
      }:
      mkDerivation {
        pname = "queryparser";
-       version = "0.1.0.0";
-       sha256 = "0ixx2ff7b3m7i8yp23x8nx0bpq92r387ddqag1i0026hljwpqchr";
+       version = "0.1.0.1";
+       sha256 = "1rz3v3cks7ys6313gispxbs8wzm8h5lccl27f9nhha7rpzl9qkcj";
        libraryHaskellDepends = [
          aeson base bytestring containers fixed-list hashable mtl parsec
          predicate-class pretty QuickCheck semigroups text
@@ -167168,9 +167825,23 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Analysis and parsing library for SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {predicate-class = null;};
+     }) {};
+
+  "queryparser-demo" = callPackage
+    ({ mkDerivation, base, containers, pretty, queryparser
+     , queryparser-vertica, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "queryparser-demo";
+       version = "0.1.0.0";
+       sha256 = "1ndm7rdwnl8sgfi5058hh1l7xisxbvxl8ign91hwpkyqfmgx3ypi";
+       libraryHaskellDepends = [
+         base containers pretty queryparser queryparser-vertica text
+         unordered-containers
+       ];
+       description = "Demo package containing queryparser examples";
+       license = stdenv.lib.licenses.mit;
+     }) {};
 
   "queryparser-hive" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, fixed-list
@@ -167180,8 +167851,8 @@ self: {
      }:
      mkDerivation {
        pname = "queryparser-hive";
-       version = "0.1.0.0";
-       sha256 = "1lh8vj0wbgpsliq8dcfp6cibd0ka3gf8j0b132b1dy9hz8q3k99s";
+       version = "0.1.0.1";
+       sha256 = "0rj1v715wr3z76mp7i581bsjfvl9038kh4ccwlvjzi67afvds0b8";
        libraryHaskellDepends = [
          aeson base bytestring containers fixed-list hashable mtl parsec
          predicate-class pretty queryparser QuickCheck regex-tdfa semigroups
@@ -167189,9 +167860,7 @@ self: {
        ];
        description = "Parsing for Hive SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {predicate-class = null;};
+     }) {};
 
   "queryparser-presto" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, fixed-list
@@ -167201,8 +167870,8 @@ self: {
      }:
      mkDerivation {
        pname = "queryparser-presto";
-       version = "0.1.0.0";
-       sha256 = "10yh0j7xxmyxpfkixk8wjfl0sbb6y51kylvc6jnl3wclcyw31jvf";
+       version = "0.1.0.1";
+       sha256 = "0ibcbv76c1qv8w50v7gzq6vv3l9hbda5ir95k44rk1da6n53hj3b";
        libraryHaskellDepends = [
          aeson base bytestring containers fixed-list hashable mtl parsec
          predicate-class pretty queryparser QuickCheck regex-tdfa semigroups
@@ -167210,9 +167879,7 @@ self: {
        ];
        description = "Parsing for Presto SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {predicate-class = null;};
+     }) {};
 
   "queryparser-vertica" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, fixed-list
@@ -167222,8 +167889,8 @@ self: {
      }:
      mkDerivation {
        pname = "queryparser-vertica";
-       version = "0.1.0.0";
-       sha256 = "04g4ciqjkphyim0wjy3mn74fd8in38wkf3hyqsd0968syxdx6ykx";
+       version = "0.1.0.1";
+       sha256 = "0pkkgb3schbb25pw8k9varx3c0iwhfc47w4f2692y6s39vpm4d5z";
        libraryHaskellDepends = [
          aeson base bytestring containers fixed-list hashable mtl parsec
          predicate-class pretty queryparser QuickCheck regex-tdfa semigroups
@@ -167231,9 +167898,7 @@ self: {
        ];
        description = "Parsing for Vertica SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {predicate-class = null;};
+     }) {};
 
   "querystring-pickle" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, test-framework
@@ -167431,15 +168096,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-classes_0_4_2" = callPackage
+  "quickcheck-classes_0_4_4" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, primitive
      , QuickCheck, semigroupoids, semigroups, tagged, transformers
      , vector
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.2";
-       sha256 = "1whin052j39gdvqy1kvfrqiyfa76amclp6pschqd6xmmw2vly491";
+       version = "0.4.4";
+       sha256 = "0g4hjgjz1wpb8fwn70gd7di69mrn6z46q39g93z3w0cwydqlcgng";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups tagged transformers
@@ -170061,20 +170726,21 @@ self: {
 
   "reactive-banana" = callPackage
     ({ mkDerivation, base, containers, hashable, HUnit, pqueue
-     , psqueues, test-framework, test-framework-hunit, transformers
-     , unordered-containers, vault
+     , psqueues, semigroups, test-framework, test-framework-hunit
+     , transformers, unordered-containers, vault
      }:
      mkDerivation {
        pname = "reactive-banana";
-       version = "1.1.0.1";
-       sha256 = "1hvhzr3cvg91l8kwxia0idg3n9jrh4knlcrmzm9j978dckzrc3mc";
+       version = "1.2.0.0";
+       sha256 = "1bwzkpackjpzk2igmlahr2qhgacad62v48lam97g9q85zww70p29";
        libraryHaskellDepends = [
-         base containers hashable pqueue transformers unordered-containers
-         vault
+         base containers hashable pqueue semigroups transformers
+         unordered-containers vault
        ];
        testHaskellDepends = [
-         base containers hashable HUnit pqueue psqueues test-framework
-         test-framework-hunit transformers unordered-containers vault
+         base containers hashable HUnit pqueue psqueues semigroups
+         test-framework test-framework-hunit transformers
+         unordered-containers vault
        ];
        homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Library for functional reactive programming (FRP)";
@@ -170782,8 +171448,8 @@ self: {
      }:
      mkDerivation {
        pname = "recursion-schemes-ext";
-       version = "1.0.0.2";
-       sha256 = "1k7jjargdhc5q7ay2r07fwd9wgcs249p1r1rr48qlw6lsccrparw";
+       version = "1.0.0.3";
+       sha256 = "00yj7h46pmy76iqsx1n0mlg04gzdrhyq10xm1xcl28y13jcjx9lc";
        libraryHaskellDepends = [
          base composition-prelude lens recursion-schemes
        ];
@@ -173947,6 +174613,8 @@ self: {
        pname = "resourcet";
        version = "1.1.11";
        sha256 = "1n94m2c7rxk2bgm8wywrkp9pmqlnv2dl35yaylninzm8xk1xavil";
+       revision = "1";
+       editedCabalFile = "09sgrzaaishx645hrfflxckyaq0dwk22agjf4sz8nwjafyv3ssh9";
        libraryHaskellDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat unliftio-core
@@ -174411,6 +175079,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "retry_0_7_6_2" = callPackage
+    ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
+     , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
+     , tasty-hunit, time, transformers
+     }:
+     mkDerivation {
+       pname = "retry";
+       version = "0.7.6.2";
+       sha256 = "0bmrp2h6pf43hr7sd6562qixw755h2xgszj700157pk2hxcz16ad";
+       libraryHaskellDepends = [
+         base data-default-class exceptions ghc-prim random transformers
+       ];
+       testHaskellDepends = [
+         base data-default-class exceptions ghc-prim hedgehog HUnit mtl
+         random stm tasty tasty-hedgehog tasty-hunit time transformers
+       ];
+       homepage = "http://github.com/Soostone/retry";
+       description = "Retry combinators for monadic actions that may fail";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "retryer" = callPackage
     ({ mkDerivation, base, optparse-applicative, process }:
      mkDerivation {
@@ -177456,10 +178146,8 @@ self: {
      }:
      mkDerivation {
        pname = "sandi";
-       version = "0.4.1";
-       sha256 = "08y691z8m79qm4ajx5csmgv8f9x8q4r0bcfm8gb8x88lvg19493j";
-       revision = "1";
-       editedCabalFile = "1gk6vwydqdgz1s5glv4jlkaph7g19aqdf7yxbyq0m1afaj1rvjq9";
+       version = "0.4.2";
+       sha256 = "0dvkpk91n9kz2ha04rvp231ra9sgd1ilyc1qkzf9l03iir7zrh9b";
        libraryHaskellDepends = [
          base bytestring conduit exceptions stringsearch
        ];
@@ -181941,8 +182629,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.6.0";
-       sha256 = "1llhxqnbrydikrxdd10cfk4shgbfpxvlsym0lvvvbva4vci1k8wj";
+       version = "0.0.7.0";
+       sha256 = "1a0ipg1zds393ywjb1f5yphb23ccb39gv8rc6qv5b7y523cgwri2";
        libraryHaskellDepends = [
          aeson base base-compat bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -182227,6 +182915,8 @@ self: {
        pname = "servant-swagger";
        version = "1.1.5";
        sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg";
+       revision = "1";
+       editedCabalFile = "005b3z7wxcrad8210yw3qsndh3zh0v2h8j50qxl8sj1l6wqb7zs6";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base bytestring hspec http-media insert-ordered-containers
@@ -182254,6 +182944,8 @@ self: {
        pname = "servant-swagger-ui";
        version = "0.2.5.3.9.1";
        sha256 = "1fbznhlzh9xnnhxsazan46w5x439a31lglb8mh7j945axyh7l09m";
+       revision = "1";
+       editedCabalFile = "16lixcz9vkkgvcfwdfj3p6pmf458hymyywklzwnbhk7z16wjjhnv";
        libraryHaskellDepends = [
          base blaze-markup bytestring directory file-embed filepath
          http-media servant servant-blaze servant-server servant-swagger
@@ -183346,15 +184038,16 @@ self: {
 
   "shake-ats" = callPackage
     ({ mkDerivation, base, binary, dependency, directory, hashable
-     , hs2ats, language-ats, lens, shake, shake-ext, text
+     , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext
+     , text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.5.0.9";
-       sha256 = "1fjbdik7a2izl8sbxnv1i36h55df0v7w23pn7ivk1p18mgljc9lf";
+       version = "1.5.0.10";
+       sha256 = "07dkzhig0c0rrqz9x7k2zv2m5b46l9p914j7758r5zb6vhlni94c";
        libraryHaskellDepends = [
-         base binary dependency directory hashable hs2ats language-ats lens
-         shake shake-ext text
+         base binary dependency directory hashable hs2ats language-ats
+         microlens microlens-th shake shake-ext text
        ];
        homepage = "https://github.com/vmchale/shake-ats#readme";
        description = "Utilities for building ATS projects with shake";
@@ -183380,17 +184073,16 @@ self: {
      }) {};
 
   "shake-ext" = callPackage
-    ({ mkDerivation, base, Cabal, composition-prelude, cpphs, directory
-     , shake, template-haskell
+    ({ mkDerivation, base, Cabal, composition-prelude, directory, shake
+     , template-haskell
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.7.0.3";
-       sha256 = "0j1558a43bz7jqbbhn0myjwd9nrd6mnn4r26ix5wqhnsgfpxcw1j";
+       version = "2.7.0.4";
+       sha256 = "0pgqjbiijsl9jb5dzwrmayn5vz2wy4jckkmrikycnqhglz1q8six";
        libraryHaskellDepends = [
          base Cabal composition-prelude directory shake template-haskell
        ];
-       libraryToolDepends = [ cpphs ];
        homepage = "https://hub.darcs.net/vmchale/shake-ext";
        description = "Helper functions for linting with shake";
        license = stdenv.lib.licenses.bsd3;
@@ -186681,8 +187373,8 @@ self: {
        pname = "slug";
        version = "0.1.7";
        sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp";
-       revision = "2";
-       editedCabalFile = "0kvx1igj6fs9wrwkh68m19f5pxw1x46d489zgj6f5ah5w8wfxp2h";
+       revision = "3";
+       editedCabalFile = "1kqaqhg8bkrkax41pbi18612s0m9w2324n5akn5nhmxq0zla73vh";
        libraryHaskellDepends = [
          aeson base exceptions http-api-data path-pieces persistent
          QuickCheck text
@@ -189718,29 +190410,20 @@ self: {
      , http-types, list-t, monad-control, monad-control-aligned, mtl
      , nested-routes, path, path-extra, pred-trie, stm, strict, text
      , tmapchan, tmapmvar, transformers, unordered-containers, urlpath
-     , uuid, wai-middleware-content-type, wai-transformers, websockets
-     , websockets-simple, wuss
+     , uuid, wai, wai-middleware-content-type, wai-transformers
+     , websockets, websockets-simple, wuss
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.1.1";
-       sha256 = "14apx9pxbl9s9i5d8i7x3y9wyzdyx3gspz4l4h4vaddg996pq0il";
+       version = "0.0.1.2";
+       sha256 = "05n95zq4lxj98xp7rqh7rlpv3ybkfgbb4x3jczgjkfxfn3caycxl";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
          http-client http-client-tls http-types list-t monad-control
          monad-control-aligned mtl nested-routes path path-extra pred-trie
          stm strict text tmapchan tmapmvar transformers unordered-containers
-         urlpath uuid wai-middleware-content-type wai-transformers
-         websockets websockets-simple wuss
-       ];
-       testHaskellDepends = [
-         aeson aeson-attoparsec async attoparsec attoparsec-uri base
-         bytestring deepseq exceptions extractable-singleton hashable
-         http-client http-client-tls http-types list-t monad-control
-         monad-control-aligned mtl nested-routes path path-extra pred-trie
-         stm strict text tmapchan tmapmvar transformers unordered-containers
-         urlpath uuid wai-middleware-content-type wai-transformers
+         urlpath uuid wai wai-middleware-content-type wai-transformers
          websockets websockets-simple wuss
        ];
        description = "Unified streaming dependency management for web apps";
@@ -193614,6 +194297,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_20_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , hashable, hspec, hspec-discover, lens, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.20.0";
+       sha256 = "0qkhgm951b377i7ny28faczw2s32rrmfvrh1lcgzfz7gszakb5bw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hashable lens
+         template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hashable hspec
+         hspec-discover lens template-haskell text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -193807,6 +194515,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-benchmarks" = callPackage
+    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit
+     , csv, deepseq, directory, gauge, list-t, list-transformer, logict
+     , machines, mtl, pipes, random, split, streaming, streamly, text
+     , transformers, typed-process, vector
+     }:
+     mkDerivation {
+       pname = "streaming-benchmarks";
+       version = "0.1.0";
+       sha256 = "0nyv4z828fj8jhan7q0bx2s351xmbxz9z81g2x3nyk4ad1rqjpyq";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Chart Chart-diagrams csv directory split text
+         typed-process
+       ];
+       benchmarkHaskellDepends = [
+         base conduit deepseq gauge list-t list-transformer logict machines
+         mtl pipes random streaming streamly transformers vector
+       ];
+       homepage = "http://github.com/composewell/streaming-benchmarks";
+       description = "Benchmarks to compare streaming packages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, hspec, streaming
      , streaming-bytestring
@@ -193925,8 +194659,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-concurrency";
-       version = "0.3.1.0";
-       sha256 = "151nyi75qrlvp5q3xi678rkg2vk0mrvpyr8c4yagh1df90amhvsm";
+       version = "0.3.1.1";
+       sha256 = "1qpcplkwdw8dinhn20wwnfgqf07gzyp61lx6m6w0126hr8fq9r35";
        libraryHaskellDepends = [
          base exceptions lifted-async monad-control stm streaming
          streaming-with transformers-base
@@ -194096,8 +194830,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-sort";
-       version = "0.1.0.0";
-       sha256 = "0zv66xdrg457gskfnviic9mmh38zk9vxsigrlbci8a2fwmphmjxg";
+       version = "0.1.0.2";
+       sha256 = "0877zzip19zdfn7a5b59x911rh7cjxqmxyrr9ivhahgh8igfsjf9";
        libraryHaskellDepends = [
          base binary bytestring directory exceptions streaming
          streaming-binary streaming-bytestring streaming-with transformers
@@ -194154,8 +194888,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-with";
-       version = "0.2.1.0";
-       sha256 = "04i4k7n37qblf9yxdj0bl1qr0arpkv2l06kx7f8aqf1xa7vvxz9i";
+       version = "0.2.1.1";
+       sha256 = "0wyq183z10sr0sdx28n316x22f4h8v67cg164qir3fb7q09pmqbg";
        libraryHaskellDepends = [
          base exceptions managed streaming-bytestring temporary transformers
        ];
@@ -194187,15 +194921,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "streamly_0_1_1" = callPackage
+  "streamly_0_1_2" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, criterion
      , exceptions, hspec, lifted-base, lockfree-queue, monad-control
      , mtl, stm, transformers, transformers-base
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.1.1";
-       sha256 = "1zblhnn2rjsmbdliihsghwl6rv7g0bcdh3d10xx8c4x420hwg2f6";
+       version = "0.1.2";
+       sha256 = "1axqac7zi2b87q91hxv75dpk4pfd4d4fcvsna7cjgkhkdvvjarzp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -205310,8 +206044,8 @@ self: {
        pname = "token-bucket";
        version = "0.1.0.1";
        sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii";
-       revision = "2";
-       editedCabalFile = "03kkavw01mlgaxgc0ifvldn8pkq2dfncrwqrf0r33ldggfzm6qm3";
+       revision = "3";
+       editedCabalFile = "1gqlxy3rwrgag4qbjkh1f2kya4gcy1x5ic9xn997nzc6yi334v7m";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        homepage = "https://github.com/hvr/token-bucket";
@@ -205949,8 +206683,8 @@ self: {
      }:
      mkDerivation {
        pname = "trackit";
-       version = "0.1";
-       sha256 = "0dcf3h140pwvyrfb0x6b4brp9bpr2p1krd1pvl014jvqak4q2q7d";
+       version = "0.2.1";
+       sha256 = "1rdsjpmilc2k7141glqswngckqlvfynfcppf84111x5ppdhkmvb4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -206019,6 +206753,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "transaction" = callPackage
+    ({ mkDerivation, base, doctest, Glob, hspec, mono-traversable
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "transaction";
+       version = "0.1.1.1";
+       sha256 = "18i0x6abg02w9lf5zxb8gj1fw5450a45nw66sjy9kc0dhi7dcwq5";
+       libraryHaskellDepends = [ base mono-traversable ];
+       testHaskellDepends = [
+         base doctest Glob hspec mono-traversable QuickCheck
+       ];
+       homepage = "https://github.com/arowM/haskell-transaction#readme";
+       description = "Monadic representation of transactions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "transactional-events" = callPackage
     ({ mkDerivation, base, ListZipper, MonadPrompt, stm }:
      mkDerivation {
@@ -208898,6 +209649,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-of-html_1_3_3_1" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq
+     , double-conversion, ghc-prim, hspec, QuickCheck, random, text
+     , weigh
+     }:
+     mkDerivation {
+       pname = "type-of-html";
+       version = "1.3.3.1";
+       sha256 = "03js8d0sv31a7m1q49l64vp4fhxlgxbgsjllrpmlahzjkcprlj70";
+       libraryHaskellDepends = [
+         base bytestring double-conversion ghc-prim text
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion deepseq random text weigh
+       ];
+       homepage = "https://github.com/knupfer/type-of-html";
+       description = "High performance type driven html generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "type-operators" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -212185,6 +212958,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "userid_0_1_3_2" = callPackage
+    ({ mkDerivation, aeson, base, boomerang, cereal, safecopy
+     , web-routes, web-routes-th
+     }:
+     mkDerivation {
+       pname = "userid";
+       version = "0.1.3.2";
+       sha256 = "0ym8r3jg7waypc74liv1v32sc1rv419axgbz97xznssb9wshcv3a";
+       libraryHaskellDepends = [
+         aeson base boomerang cereal safecopy web-routes web-routes-th
+       ];
+       homepage = "http://www.github.com/Happstack/userid";
+       description = "The UserId type and useful instances for web development";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "users" = callPackage
     ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
      mkDerivation {
@@ -215127,11 +215917,11 @@ self: {
     ({ mkDerivation, base, ghc-prim, vulkan }:
      mkDerivation {
        pname = "vulkan-api";
-       version = "0.1.0.1";
-       sha256 = "192bid9aqndn7lh3vdvk2mhqc76z5fw2z4v362n2bjhdaadwipld";
+       version = "1.1.0.0";
+       sha256 = "038iaiy16cyb0g6xhgax8333lz0y4jfmv4r8dqvvmnnmhiak5j8x";
        libraryHaskellDepends = [ base ghc-prim ];
        librarySystemDepends = [ vulkan ];
-       homepage = "https://github.com/achirkin/genvulkan#readme";
+       homepage = "https://github.com/achirkin/vulkan#readme";
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215685,6 +216475,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-handler-launch_3_0_2_4" = callPackage
+    ({ mkDerivation, async, base, bytestring, http-types, process
+     , streaming-commons, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "wai-handler-launch";
+       version = "3.0.2.4";
+       sha256 = "0019vz9ha2mvliz3drjbj62v26mwhl9bl1vqr06ki40865hrr78f";
+       libraryHaskellDepends = [
+         async base bytestring http-types process streaming-commons
+         transformers wai warp
+       ];
+       description = "Launch a web app in the default browser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-handler-scgi" = callPackage
     ({ mkDerivation, base, bytestring, wai, wai-extra }:
      mkDerivation {
@@ -216114,8 +216921,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-content-type";
-       version = "0.6.0";
-       sha256 = "19c5sjrgfvc12f020cssr4ydsd7ib9wxabm594mn9z32sq6qv4f8";
+       version = "0.6.1.1";
+       sha256 = "08lcbyycgr2mb8i00ncph38r0yixx6nn5yfkvv96700wfn0338q4";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring clay exceptions
          extractable-singleton hashable http-media http-types lucid mmorph
@@ -216131,6 +216938,7 @@ self: {
          transformers transformers-base unordered-containers urlpath wai
          wai-logger wai-transformers warp
        ];
+       homepage = "https://github.com/athanclark/wai-middleware-content-type#readme";
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216463,22 +217271,24 @@ self: {
      }) {};
 
   "wai-middleware-verbs" = callPackage
-    ({ mkDerivation, base, errors, exceptions, hashable, http-types
-     , mmorph, monad-logger, mtl, resourcet, transformers
-     , transformers-base, unordered-containers, wai
+    ({ mkDerivation, base, bytestring, exceptions, hashable, http-types
+     , mmorph, monad-control, monad-control-aligned, monad-logger, mtl
+     , resourcet, transformers, transformers-base, unordered-containers
+     , wai, wai-transformers
      }:
      mkDerivation {
        pname = "wai-middleware-verbs";
-       version = "0.3.2";
-       sha256 = "0rma394hfpycaqfyr9bpal2v27559hrm7yd83x7dh13jv9zsj7v9";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.0.1";
+       sha256 = "1x4x41b1gbr2xvfw1q766wcvdl13wwv9spa9zxvjdykg71knnw93";
        libraryHaskellDepends = [
-         base errors exceptions hashable http-types mmorph monad-logger mtl
-         resourcet transformers transformers-base unordered-containers wai
+         base bytestring exceptions hashable http-types mmorph monad-control
+         monad-control-aligned monad-logger mtl resourcet transformers
+         transformers-base unordered-containers wai wai-transformers
        ];
-       description = "Route different middleware responses based on the incoming HTTP verb";
+       homepage = "https://github.com/athanclark/wai-middleware-verbs#readme";
+       description = "Route Wai middlewares based on HTTP verbs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-predicates" = callPackage
@@ -217653,6 +218463,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "web-routes_0_27_14_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, exceptions
+     , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
+     , split, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "web-routes";
+       version = "0.27.14.2";
+       sha256 = "0jpps7ay2hw41595hlfrx5k4lh9p2nib02n3rhd1vphpbnf392xg";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring exceptions ghc-prim http-types mtl
+         parsec split text utf8-string
+       ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck text ];
+       homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
+       description = "portable, type-safe URL routing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "web-routes-boomerang" = callPackage
     ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }:
      mkDerivation {
@@ -218335,23 +219165,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets-simple_0_1_1" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
-     , monad-control, profunctors, stm, tasty, tasty-hspec, transformers
-     , vector, wai-transformers, websockets
+  "websockets-simple_0_1_2_1" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions
+     , extractable-singleton, hspec, monad-control-aligned, profunctors
+     , stm, tasty, tasty-hspec, transformers, vector, wai-transformers
+     , websockets
      }:
      mkDerivation {
        pname = "websockets-simple";
-       version = "0.1.1";
-       sha256 = "0hakr1vrfj0n3sgax08vsa1bcnddqkizr2fb9pjk9abhw4hn5k2y";
+       version = "0.1.2.1";
+       sha256 = "1g3cqbdycjx82px06xvh4q3jjnp71llzsw4v0s815933fgfcck54";
        libraryHaskellDepends = [
-         aeson async base bytestring exceptions monad-control profunctors
-         stm transformers vector wai-transformers websockets
+         aeson async base bytestring exceptions extractable-singleton
+         monad-control-aligned profunctors stm transformers vector
+         wai-transformers websockets
        ];
        testHaskellDepends = [
-         aeson async base bytestring exceptions hspec monad-control
-         profunctors stm tasty tasty-hspec transformers vector
-         wai-transformers websockets
+         aeson async base bytestring exceptions extractable-singleton hspec
+         monad-control-aligned profunctors stm tasty tasty-hspec
+         transformers vector wai-transformers websockets
        ];
        homepage = "https://github.com/athanclark/websockets-simple#readme";
        description = "Composable websockets clients";
@@ -221339,6 +222171,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xlsx_0_7_2" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
+     , bytestring, conduit, containers, criterion, data-default, deepseq
+     , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
+     , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
+     , tasty-smallcheck, text, time, transformers, vector, xeno
+     , xml-conduit, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "xlsx";
+       version = "0.7.2";
+       sha256 = "00qigyz4nc23abawapxhw0sgmj9c5qplkkvyv6xxffanx9kh8mmj";
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary-search bytestring conduit
+         containers data-default deepseq errors extra filepath lens mtl
+         network-uri old-locale safe text time transformers vector xeno
+         xml-conduit zip-archive zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff groom lens mtl raw-strings-qq
+         smallcheck tasty tasty-hunit tasty-smallcheck text time vector
+         xml-conduit
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "https://github.com/qrilka/xlsx";
+       description = "Simple and incomplete Excel file parser/writer";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xlsx-tabular" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
@@ -222109,6 +222971,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xmlgen_0_6_2_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, containers
+     , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text
+     , unix
+     }:
+     mkDerivation {
+       pname = "xmlgen";
+       version = "0.6.2.2";
+       sha256 = "1milbbr2iqwckqbq6i9sypinvs4hs7mzqn274x350psjfy6ajvwj";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers mtl text
+       ];
+       testHaskellDepends = [
+         base bytestring containers filepath HUnit hxt process QuickCheck
+         text unix
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion text ];
+       description = "Fast XML generation library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xmlhtml" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
      , bytestring, bytestring-builder, containers, directory, hspec

From dfa16404295d4b918b0959f76a56026886bb90df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 19:33:04 +0200
Subject: [PATCH 102/119] haskell-brick: fix override for ghc-8.4.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index ed39896863b4..613af548c331 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -655,7 +655,7 @@ self: super: {
     });
 
   # Older versions don't compile.
-  brick = self.brick_0_35;
+  brick = self.brick_0_35_1;
   getopt-generics = self.getopt-generics_0_13_0_2;
   HaTeX = self.HaTeX_3_19_0_0;
   json = self.json_0_9_2;

From 7ac95d5a8a81fe2c70714bfdfe63fd74dc7f5bfa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 20:02:41 +0200
Subject: [PATCH 103/119] haskell-hledger-lib: drop obsolete override for
 ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix            | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 613af548c331..a8ba253839a6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -641,13 +641,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  # Fix missing semigroup instance for Journal.
-  hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch
-    { url = https://github.com/simonmichael/hledger/pull/718.patch;
-      sha256 = "1gcs9j934wvk9hbn27zm42dnvf4x1gxr54li4kdw3zi3160y2l5c";
-      stripLen = 1;
-    });
-
   # Fix missing semigroup instance.
   data-inttrie = appendPatch super.data-inttrie (pkgs.fetchpatch
     { url = https://github.com/luqui/data-inttrie/pull/5.patch;

From eb8127a1d25d8c058d7f48e57025988ff7de4196 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Mar 2018 20:03:48 +0200
Subject: [PATCH 104/119] hackage: update db snapshot

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index c20e56a17117..792ff0304925 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b09de4efc2a385cf3407072c24c21ec8ec774a03.tar.gz";
-  sha256 = "0yy3k5wgi9zgwz51gxakhlalwac59fkh0flydf334msrxlc3xf9z";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6272b092cf23aa30154cd90ab0f5786c69bceb17.tar.gz";
+  sha256 = "11qs8whpqkj1l3mhx9ibpwh5pwgwj0xb6r9r8c7wk414vdmaa5mw";
 }

From 2dec4a94ed6ddcb1dc5968d3d248e125e80a015d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 25 Mar 2018 20:48:55 +0200
Subject: [PATCH 105/119] vis: 0.4 -> 0.5

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

diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 2af6e93bcfcc..7825188fea9b 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "vis-${version}";
-  version  = "0.4";
+  version  = "0.5";
 
   src = fetchFromGitHub {
     rev = "v${version}";
-    sha256 = "1crsg3ssqv4xix9z16hwl0zyx7hxk686s52zmrp7yfak3m5igf9k";
+    sha256 = "1vhq6hprkgj90iwl5vl3pxs3xwc01mx8yhi6c1phzry5agqqp8jb";
     repo = "vis";
     owner = "martanne";
   };

From bad2ecb9b52a1ce6070723bf86588c20b43be78a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:03:18 -0400
Subject: [PATCH 106/119] linux: 4.4.123 -> 4.4.124

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 58abf35e92b5..766eef83ddf8 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.123";
+  version = "4.4.124";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "115mvgwcx2syjrn943k4qqyvqkysdm6rgq97dhf1gcxf671qb204";
+    sha256 = "0a91phmdpa82s3mqnyw2an3j4v18cksvy1akdyxf5w2byq51qd2r";
   };
 } // (args.argsOverride or {}))

From 36555e46f8e6e0b2573877ea70f99b064b0bda04 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:03:33 -0400
Subject: [PATCH 107/119] linux: 4.9.89 -> 4.9.90

---
 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 0b18a624167b..4832c79d02f9 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, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.89";
+  version = "4.9.90";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0a9l2gkyr1nhaak6vyjwgjn01ywpxwa8zp5fhw8rjnfk44bf2hql";
+    sha256 = "0mbl0d6z8yx7bn5m804kv17bh64pd0w0nc8lls4pw335jx7hkc0v";
   };
 } // (args.argsOverride or {}))

From 2d5d99a7e38635e1784b36c8e562d3f8a04be736 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:03:47 -0400
Subject: [PATCH 108/119] linux: 4.14.29 -> 4.14.30

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 4e086259036e..faf151564589 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.29";
+  version = "4.14.30";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "06a6q69jwvggns5rf473nfgfwlkfyj8zs6vrjppwf8lrrrq7pxhq";
+    sha256 = "0ib6zqn1psffgffmvqmh9x3wdh15yd8z0gwwkamvgwa8xcpv0nvw";
   };
 } // (args.argsOverride or {}))

From 1d41231daaee99a6523a3b9aeefafc7d830730e6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:04:02 -0400
Subject: [PATCH 109/119] linux: 4.15.12 -> 4.15.13

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
index 979e8fe05e13..f88ddadca8f4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.15.12";
+  version = "4.15.13";
 
   # 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 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0j7l907m51y05cd1sqf3sn7vx4n6c07kn7q0ndnyg6wqb7h667h3";
+    sha256 = "1iam2adh6ghzv0lgh60c03pzrhv4axxw6k78xh209v889xdfjbhx";
   };
 } // (args.argsOverride or {}))

From 026d53020ccc93eb79a762fe99e02f116e7059b2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Mar 2018 15:05:35 -0400
Subject: [PATCH 110/119] linux-copperhead: 4.15.12.a -> 4.15.13.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index 94885efef900..680c5d8d64f0 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.12";
+  version = "4.15.13";
   revision = "a";
-  sha256 = "1n0sqhqvm9p6w1yh7si8rw84qxf9c5kch7pvjyrp51ir1xh7grfr";
+  sha256 = "0zmamaf600jja3m2i41rysxq0rqixiz1vvd1nf5bd8piqkd8dbvf";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 675dc1bfbfd87c02c8588d78ffc903fb6987f6e4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Mar 2018 14:11:00 -0500
Subject: [PATCH 111/119] apache-ant: init 1.9

1.9.x is a legacy version of ant supporting Java 5, 6, and 7

Fixes #37747
---
 .../tools/build-managers/apache-ant/1.9.nix   | 111 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   3 +
 2 files changed, 114 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/apache-ant/1.9.nix

diff --git a/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
new file mode 100644
index 000000000000..8816a005ca0f
--- /dev/null
+++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix
@@ -0,0 +1,111 @@
+{ fetchurl, stdenv, coreutils, makeWrapper }:
+
+let version = "1.9.6"; in
+
+stdenv.mkDerivation {
+  name = "ant-${version}";
+
+  buildInputs = [ makeWrapper ];
+
+  src = fetchurl {
+    url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
+    sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4";
+  };
+
+  contrib = fetchurl {
+    url = mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2;
+    sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1";
+  };
+
+  installPhase =
+    ''
+      mkdir -p $out/bin $out/lib/ant
+      mv * $out/lib/ant/
+
+      # Get rid of the manual (35 MiB).  Maybe we should put this in a
+      # separate output.  Keep the antRun script since it's vanilla sh
+      # and needed for the <exec/> task (but since we set ANT_HOME to
+      # a weird value, we have to move antRun to a weird location).
+      # Get rid of the other Ant scripts since we provide our own.
+      mv $out/lib/ant/bin/antRun $out/bin/
+      rm -rf $out/lib/ant/{manual,bin,WHATSNEW}
+      mkdir $out/lib/ant/bin
+      mv $out/bin/antRun $out/lib/ant/bin/
+
+      # Install ant-contrib.
+      unpackFile $contrib
+      cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/
+
+      cat >> $out/bin/ant <<EOF
+      #! ${stdenv.shell} -e
+
+      ANT_HOME=$out/lib/ant
+
+      # Find the JDK by looking for javac.  As a fall-back, find the
+      # JRE by looking for java.  The latter allows just the JRE to be
+      # used with (say) ECJ as the compiler.  Finally, allow the GNU
+      # JVM.
+      if [ -z "\$JAVA_HOME" ]; then
+          for i in javac java gij; do
+              if p="\$(type -p \$i)"; then
+                  export JAVA_HOME="\$(${coreutils}/bin/dirname \$(${coreutils}/bin/dirname \$(${coreutils}/bin/readlink -f \$p)))"
+                  break
+              fi
+          done
+          if [ -z "\$JAVA_HOME" ]; then
+              echo "\$0: cannot find the JDK or JRE" >&2
+              exit 1
+          fi
+      fi
+
+      if [ -z \$NIX_JVM ]; then
+          if [ -e \$JAVA_HOME/bin/java ]; then
+              NIX_JVM=\$JAVA_HOME/bin/java
+          elif [ -e \$JAVA_HOME/bin/gij ]; then
+              NIX_JVM=\$JAVA_HOME/bin/gij
+          else
+              NIX_JVM=java
+          fi
+      fi
+
+      LOCALCLASSPATH="\$ANT_HOME/lib/ant-launcher.jar\''${LOCALCLASSPATH:+:}\$LOCALCLASSPATH"
+
+      exec \$NIX_JVM \$NIX_ANT_OPTS \$ANT_OPTS -classpath "\$LOCALCLASSPATH" \
+          -Dant.home=\$ANT_HOME -Dant.library.dir="\$ANT_LIB" \
+          org.apache.tools.ant.launch.Launcher \$NIX_ANT_ARGS \$ANT_ARGS \
+          -cp "\$CLASSPATH" "\$@"
+      EOF
+
+      chmod +x $out/bin/ant
+    ''; # */
+
+  meta = {
+    homepage = http://ant.apache.org/;
+    description = "A Java-based build tool";
+
+    longDescription = ''
+      Apache Ant is a Java-based build tool.  In theory, it is kind of like
+      Make, but without Make's wrinkles.
+
+      Why another build tool when there is already make, gnumake, nmake, jam,
+      and others? Because all those tools have limitations that Ant's
+      original author couldn't live with when developing software across
+      multiple platforms.  Make-like tools are inherently shell-based -- they
+      evaluate a set of dependencies, then execute commands not unlike what
+      you would issue in a shell.  This means that you can easily extend
+      these tools by using or writing any program for the OS that you are
+      working on.  However, this also means that you limit yourself to the
+      OS, or at least the OS type such as Unix, that you are working on.
+
+      Ant is different.  Instead of a model where it is extended with
+      shell-based commands, Ant is extended using Java classes.  Instead of
+      writing shell commands, the configuration files are XML-based, calling
+      out a target tree where various tasks get executed.  Each task is run
+      by an object that implements a particular Task interface.
+    '';
+
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f0efc2d8f42..a4726f59b893 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6360,6 +6360,7 @@ with pkgs;
       callPackage ../development/compilers/openjdk-darwin { }
     else
       callPackage ../development/compilers/openjdk/7.nix {
+        ant = apacheAnt_1_9;
         bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
       };
 
@@ -7423,6 +7424,8 @@ with pkgs;
 
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
 
+  apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
+
   apacheKafka = apacheKafka_1_0;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };

From ce8ce600ae41d3899e4a556fa9ff8a1a34374063 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 25 Mar 2018 23:01:31 -0500
Subject: [PATCH 112/119] unix-tools: introduce unix-tools.nix

unix-tools.nix has a collection of tools that are commonly installed
by default in Unix derivatives. This is intended to provide
compatibility between macOS and Linux users. Three Linux-only
derivations are provided for compatbility:

- procps
- utillinux
- nettools

More tools are also provided.

Also: treewide: use unixtools

Non-comprehensive replace of Linux-only procps and util-linux with
'unixtools'.
---
 .../version-management/gitlab/default.nix     |  6 +-
 pkgs/servers/nosql/cassandra/generic.nix      |  3 +-
 pkgs/servers/xmpp/biboumi/default.nix         |  7 +-
 pkgs/servers/xmpp/ejabberd/default.nix        |  3 +-
 pkgs/tools/misc/keychain/default.nix          |  5 +-
 pkgs/tools/misc/parallel/default.nix          |  2 +-
 pkgs/tools/networking/i2p/default.nix         |  4 +-
 pkgs/tools/security/pass/default.nix          |  2 +-
 pkgs/tools/security/sshuttle/default.nix      |  4 +-
 pkgs/top-level/all-packages.nix               | 21 +++--
 pkgs/top-level/unix-tools.nix                 | 89 +++++++++++++++++++
 11 files changed, 119 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/top-level/unix-tools.nix

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 1c3d1928a8b0..7cfaeff33827 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,5 +1,5 @@
 { pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv
-, ruby, tzdata, git, procps, dpkg, nettools
+, ruby, tzdata, git, ps, dpkg, nettools
 }:
 
 /* When updating the Gemfile add `gem "activerecord-nulldb-adapter"`
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    rubyEnv ruby bundler tzdata git procps dpkg nettools
+    rubyEnv ruby bundler tzdata git ps dpkg nettools
   ];
 
   patches = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     rm config/initializers/gitlab_shell_secret_token.rb
 
     substituteInPlace app/controllers/admin/background_jobs_controller.rb \
-        --replace "ps -U" "${procps}/bin/ps -U"
+        --replace "ps -U" "${ps}/bin/ps -U"
 
     sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
 
diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix
index 50b56213b308..48875b093a8d 100644
--- a/pkgs/servers/nosql/cassandra/generic.nix
+++ b/pkgs/servers/nosql/cassandra/generic.nix
@@ -10,7 +10,8 @@ let
     gawk
     which
     jre
-  ] ++ stdenv.lib.optional stdenv.isLinux procps);
+    procps
+  ]);
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix
index f46b3189edfe..7ef6242d2b25 100644
--- a/pkgs/servers/xmpp/biboumi/default.nix
+++ b/pkgs/servers/xmpp/biboumi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn,
-  libiconv, botan2, systemd, pkgconfig, udns, pandoc, procps } :
+  libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } :
 
 stdenv.mkDerivation rec {
   name = "biboumi-${version}";
@@ -20,12 +20,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig pandoc ];
   buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd
-    udns procps ];
+    udns ];
 
-  inherit procps;
   preConfigure = ''
     substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi
-    substituteInPlace unit/biboumi.service.cmake --replace /bin/kill $procps/bin/kill
+    substituteInPlace unit/biboumi.service.cmake --replace /bin/kill ${coreutils}/bin/kill
     cp $louiz_catch/single_include/catch.hpp tests/
     # echo "policy_directory=$out/etc/biboumi" >> conf/biboumi.cfg
     # TODO include conf/biboumi.cfg as example somewhere
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index cd27f69e5f4b..f95b5efe3d38 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,5 +1,6 @@
 { stdenv, writeScriptBin, lib, fetchurl, git, cacert
 , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd
+, flock
 , withMysql ? false
 , withPgsql ? false
 , withSqlite ? false, sqlite
@@ -101,7 +102,7 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     sed -i \
       -e '2iexport PATH=${ctlpath}:$PATH' \
-      -e 's,\(^ *FLOCK=\).*,\1${utillinux}/bin/flock,' \
+      -e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \
       -e 's,\(^ *JOT=\).*,\1,' \
       -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
       $out/sbin/ejabberdctl
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 7fd9897a71bb..133a461964bd 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg
-, perl, procps, gnugrep, gawk, findutils, gnused
-, withProcps ? stdenv.isLinux }:
+, perl, procps, gnugrep, gawk, findutils, gnused }:
 
 stdenv.mkDerivation rec {
   name = "keychain-${version}";
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
       --prefix PATH ":" "${gnused}/bin" \
       --prefix PATH ":" "${findutils}/bin" \
       --prefix PATH ":" "${gawk}/bin" \
-      ${if withProcps then ("--prefix PATH \":\" ${procps}/bin") else ""}
+      --prefix PATH ":" "${procps}/bin"
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 7287da2079a1..b7116b53b114 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/parallel \
-      ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \
+      --prefix PATH : "${procps}/bin" \
       --prefix PATH : "${perl}/bin" \
   '';
 
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index ec268d5d77f6..58533f683e71 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
+{ stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 let wrapper = stdenv.mkDerivation rec {
   name = "wrapper-${version}";
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
       -e "s#uname#${coreutils}/bin/uname#" \
       -e "s#which#${which}/bin/which#" \
       -e "s#%gettext%#${gettext}/bin/gettext#" \
-      -e "s#/usr/ucb/ps#${procps}/bin/ps#" \
+      -e "s#/usr/ucb/ps#${ps}/bin/ps#" \
       -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \
       -e "s#%INSTALL_PATH#$out#" \
       -e 's#%USER_HOME#$HOME#' \
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index ad2afa8ed912..4f9e6c06697c 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -74,8 +74,8 @@ in stdenv.mkDerivation rec {
     tree
     which
     qrencode
+    procps
   ] ++ optional tombPluginSupport tomb
-    ++ optional stdenv.isLinux procps
     ++ ifEnable x11Support [ dmenu xclip xdotool ]);
 
   postFixup = ''
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index d344f95573dd..c3bf4f69a46d 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -25,8 +25,8 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ makeWrapper python3Packages.setuptools_scm ] ++ stdenv.lib.optional (stdenv.system != "i686-linux") pandoc;
   buildInputs =
-    [ coreutils openssh ] ++
-    stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
+    [ coreutils openssh procps nettools ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ iptables ];
 
   checkInputs = with python3Packages; [ mock pytest pytestrunner ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4726f59b893..e14eb820d725 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12380,12 +12380,7 @@ with pkgs;
   jetty = callPackage ../servers/http/jetty { };
 
   knot-dns = callPackage ../servers/dns/knot-dns { };
-  knot-resolver = callPackage ../servers/dns/knot-resolver {
-    # TODO: vimNox after it gets fixed on Darwin or something lighter
-    hexdump = if stdenv.isLinux then utillinux.bin
-              else if stdenv.isDarwin then darwin.shell_cmds
-              else vim/*xxd*/;
-  };
+  knot-resolver = callPackage ../servers/dns/knot-resolver { };
 
   rdkafka = callPackage ../development/libraries/rdkafka { };
 
@@ -13694,7 +13689,8 @@ with pkgs;
     if hostPlatform.isMusl then musl-getconf
     else lib.getBin stdenv.cc.libc;
 
-  nettools = callPackage ../os-specific/linux/net-tools { };
+  nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
+             else unixtools.nettools;
 
   nftables = callPackage ../os-specific/linux/nftables { };
 
@@ -13817,7 +13813,8 @@ with pkgs;
 
   procps = procps-ng;
 
-  procps-ng = callPackage ../os-specific/linux/procps-ng { };
+  procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
+              else unixtools.procps;
 
   watch = callPackage ../os-specific/linux/procps/watch.nix { };
 
@@ -14010,7 +14007,9 @@ with pkgs;
 
   usermount = callPackage ../os-specific/linux/usermount { };
 
-  utillinux = callPackage ../os-specific/linux/util-linux { };
+  utillinux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { }
+              else unixtools.utillinux;
+
   utillinuxCurses = utillinux;
 
   utillinuxMinimal = appendToName "minimal" (utillinux.override {
@@ -21140,4 +21139,8 @@ with pkgs;
   xml2rfc = callPackage ../tools/typesetting/xml2rfc { };
 
   mmark = callPackage ../tools/typesetting/mmark { };
+
+  # Unix tools
+  unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
+  inherit (unixtools) hexdump ps;
 }
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
new file mode 100644
index 000000000000..706cd061b591
--- /dev/null
+++ b/pkgs/top-level/unix-tools.nix
@@ -0,0 +1,89 @@
+{ pkgs, buildEnv, runCommand, hostPlatform }:
+
+let
+
+  singleBinary = cmd: providers:
+    if builtins.hasAttr hostPlatform.parsed.kernel.name providers then
+      runCommand cmd {} ''
+        mkdir -p $out/bin
+
+        if ! [ -x "${providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}" ]; then
+          echo "Cannot find command ${cmd}"
+          exit 1
+        fi
+
+        ln -s ${providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd} $out/bin/${cmd}
+      ''
+    else throw "${hostPlatform.parsed.kernel.name} does not have ${cmd}";
+
+in rec {
+  arp = singleBinary "arp" {
+    linux = pkgs.nettools;
+    darwin = pkgs.darwin.network_cmds;
+  };
+  getopt = singleBinary "getopt" {
+    linux = pkgs.utillinux;
+    darwin = pkgs.darwin.shell_cmds;
+  };
+  hexdump = singleBinary "hexdump" {
+    linux = pkgs.procps;
+    darwin = pkgs.darwin.shell_cmds;
+  };
+  hostname = singleBinary "hostname" {
+    linux = pkgs.nettools;
+    darwin = pkgs.darwin.shell_cmds;
+  };
+  ifconfig = singleBinary "ifconfig" {
+    linux = pkgs.nettools;
+    darwin = pkgs.darwin.network_cmds;
+  };
+  netstat = singleBinary "netstat" {
+    linux = pkgs.nettools;
+    darwin = pkgs.darwin.network_cmds;
+  };
+  ping = singleBinary "ping" {
+    linux = pkgs.iputils;
+    darwin = pkgs.darwin.network_cmds;
+  };
+  ps = singleBinary "ps" {
+    linux = pkgs.procps;
+    darwin = pkgs.darwin.adv_cmds;
+  };
+  route = singleBinary "route" {
+    linux = pkgs.nettools;
+    darwin = pkgs.darwin.network_cmds;
+  };
+  script = singleBinary "script" {
+    linux = pkgs.utillinux;
+    darwin = pkgs.darwin.shell_cmds;
+  };
+  sysctl = singleBinary "sysctl" {
+    linux = pkgs.procps;
+    darwin = pkgs.darwin.system_cmds;
+  };
+  whereis = singleBinary "whereis" {
+    linux = pkgs.utillinux;
+    darwin = pkgs.darwin.shell_cmds;
+  };
+  write = singleBinary "write" {
+    linux = pkgs.utillinux;
+    darwin = pkgs.darwin.basic_cmds;
+  };
+
+  # Compatibility derivations
+
+  procps = buildEnv {
+    name = "procps-compat";
+    paths = [ sysctl ps ];
+  };
+
+  utillinux = buildEnv {
+    name = "utillinux-compat";
+    paths = [ getopt hexdump script whereis write ];
+  };
+
+  nettools = buildEnv {
+    name = "nettools-compat";
+    paths = [ arp hostname netstat route ];
+  };
+}

From ef428ab202322b93930c3db0d66573c16f692c5f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Mar 2018 18:42:46 -0500
Subject: [PATCH 113/119] treewide: cleanup procps uses

---
 pkgs/applications/misc/qsyncthingtray/default.nix     | 2 +-
 pkgs/development/compilers/go/1.10.nix                | 3 +--
 pkgs/development/compilers/go/1.9.nix                 | 3 +--
 pkgs/development/compilers/rust/rustc.nix             | 6 ++----
 pkgs/os-specific/linux/checksec/default.nix           | 4 ++--
 pkgs/os-specific/linux/gogoclient/default.nix         | 4 ++--
 pkgs/shells/grml-zsh-config/default.nix               | 4 ++--
 pkgs/tools/networking/network-manager/openconnect.nix | 5 ++---
 pkgs/tools/networking/network-manager/strongswan.nix  | 4 ++--
 pkgs/top-level/all-packages.nix                       | 4 ++--
 10 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 88628c63c9ce..6ae8f380fe28 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps ? null
+{ mkDerivation, stdenv, lib, fetchFromGitHub, fetchpatch, procps
 , qtbase, qtwebengine, qtwebkit
 , cmake
 , syncthing
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 145f6a17978d..1be94ba5c6ca 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
   };
 
   # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]
-    ++ optionals stdenv.isLinux [ procps ];
+  nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
   buildInputs = [ cacert pcre ]
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index c866212170c4..47c1d1fdc951 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
   };
 
   # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ]
-    ++ optionals stdenv.isLinux [ procps ];
+  nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
   buildInputs = [ cacert pcre ]
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 92b149865fa2..f678286eadea 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,5 +1,5 @@
 { stdenv, targetPackages
-, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
+, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
 , llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
 , which, libffi, gdb
 , version
@@ -19,8 +19,6 @@ let
   inherit (stdenv.lib) optional optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
-  procps = if stdenv.isDarwin then darwin.ps else args.procps;
-
   llvmShared = llvm.override { enableSharedLibraries = true; };
 
   target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
@@ -127,7 +125,7 @@ stdenv.mkDerivation {
 
   # ps is needed for one of the test cases
   nativeBuildInputs =
-    [ file python2 procps rustPlatform.rust.rustc git cmake
+    [ file python2 ps rustPlatform.rust.rustc git cmake
       which libffi
     ]
     # Only needed for the debuginfo tests
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index 1a879ba33304..1ef18f703d3f 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils }:
+{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils, sysctl }:
 
 stdenv.mkDerivation rec {
   name = "checksec-${version}";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils.out}/bin/readelf -"
     substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils.out}/bin/readelf -"
     substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils.out}/bin/readelf"
-    substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -"
+    substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${sysctl}/bin/sysctl -"
     substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
   '';
 
diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix
index 521b81cd690d..53895faa66cb 100644
--- a/pkgs/os-specific/linux/gogoclient/default.nix
+++ b/pkgs/os-specific/linux/gogoclient/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, nettools, iproute, procps}:
+{stdenv, fetchurl, openssl, nettools, iproute, sysctl}:
 
 let baseName = "gogoclient";
     version  = "1.2";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \
       --replace "/sbin/route"    "${nettools}/bin/route" \
       --replace "/sbin/ip"       "${iproute}/sbin/ip" \
-      --replace "/sbin/sysctl"   "${procps}/sbin/sysctl"
+      --replace "/sbin/sysctl"   "${sysctl}/bin/sysctl"
     sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
   '';
 
diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/grml-zsh-config/default.nix
index d49e13e1eb35..635077a611cf 100644
--- a/pkgs/shells/grml-zsh-config/default.nix
+++ b/pkgs/shells/grml-zsh-config/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "1xvv2mnkfqa657w8y4q2zrchhindngdzij9fbalcg1gggz4zdwcm";
   };
 
-  buildInputs = [ zsh coreutils txt2tags ]
-    ++ optional stdenv.isLinux [ inetutils procps ];
+  buildInputs = [ zsh coreutils txt2tags procps ]
+    ++ optional stdenv.isLinux [ inetutils ];
 
   buildPhase = ''
     cd doc
diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index efaa146c72f3..27fd4c4adc30 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, procps, kmod }:
+, withGnome ? true, gnome3, sysctl, kmod }:
 
 let
   pname   = "NetworkManager-openconnect";
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
 
   preConfigure = ''
      substituteInPlace "configure" \
-       --replace "/sbin/sysctl" "${procps}/bin/sysctl"
+       --replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
      substituteInPlace "src/nm-openconnect-service.c" \
        --replace "/usr/sbin/openconnect" "${openconnect}/bin/openconnect" \
        --replace "/sbin/modprobe" "${kmod}/bin/modprobe"
@@ -42,4 +42,3 @@ in stdenv.mkDerivation rec {
     inherit (networkmanager.meta) maintainers platforms;
   };
 }
-
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index cfa304901b48..fb3ba2bbdf5a 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps
+{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, sysctl
 , gnome3, libgnome-keyring, libsecret }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
      substituteInPlace "configure" \
-       --replace "/sbin/sysctl" "${procps}/bin/sysctl"
+       --replace "/sbin/sysctl" "${sysctl}/bin/sysctl"
   '';
 
   configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e14eb820d725..009830a01d2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14012,12 +14012,12 @@ with pkgs;
 
   utillinuxCurses = utillinux;
 
-  utillinuxMinimal = appendToName "minimal" (utillinux.override {
+  utillinuxMinimal = if stdenv.isLinux then appendToName "minimal" (utillinux.override {
     minimal = true;
     ncurses = null;
     perl = null;
     systemd = null;
-  });
+  }) else throw "utillinux is unsupported on non-Linux";
 
   v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
 

From 35d6688a1b1e4941344cdbc1b46e4fc2c8cd1255 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Mar 2018 21:33:42 -0500
Subject: [PATCH 114/119] top-level: add sysctl

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 009830a01d2e..860d049e8650 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21142,5 +21142,5 @@ with pkgs;
 
   # Unix tools
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
-  inherit (unixtools) hexdump ps;
+  inherit (unixtools) hexdump ps sysctl;
 }

From 4a9fddc59863c3c2077e35bff913dd664c8b6e1a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 26 Mar 2018 22:37:49 -0500
Subject: [PATCH 115/119] unixtools: cleanup

---
 pkgs/os-specific/linux/autofs/default.nix |  8 ++---
 pkgs/servers/apcupsd/default.nix          |  7 ++--
 pkgs/top-level/all-packages.nix           | 15 +++-----
 pkgs/top-level/perl-packages.nix          |  2 +-
 pkgs/top-level/unix-tools.nix             | 42 +++++++++++++++++++++++
 5 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 79e12dd0f437..a7472de1d025 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, utillinux, nfs-utils, e2fsprogs
+{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, modprobe, nfs-utils, e2fsprogs
 , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
 
 let
@@ -17,10 +17,10 @@ in stdenv.mkDerivation {
     export sssldir="${sssd}/lib/sssd/modules"
     export HAVE_SSS_AUTOFS=1
 
-    export MOUNT=${utillinux}/bin/mount
+    export MOUNT=${mount}/bin/mount
     export MOUNT_NFS=${nfs-utils}/bin/mount.nfs
-    export UMOUNT=${utillinux}/bin/umount
-    export MODPROBE=${utillinux}/bin/modprobe
+    export UMOUNT=${umount}/bin/umount
+    export MODPROBE=${modprobe}/bin/modprobe
     export E2FSCK=${e2fsprogs}/bin/fsck.ext2
     export E3FSCK=${e2fsprogs}/bin/fsck.ext3
     export E4FSCK=${e2fsprogs}/bin/fsck.ext4
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 3b67171a474e..5f0440fc6913 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, nettools, man
+{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man
+, utillinux
 , enableCgiScripts ? true, gd
 }:
 
@@ -46,8 +47,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     for file in "$out"/etc/apcupsd/*; do
-        sed -i -e 's|^WALL=.*|WALL="${utillinux}/bin/wall"|g' \
-               -e 's|^HOSTNAME=.*|HOSTNAME=`${nettools}/bin/hostname`|g' \
+        sed -i -e 's|^WALL=.*|WALL="${wall}/bin/wall"|g' \
+               -e 's|^HOSTNAME=.*|HOSTNAME=`${hostname}/bin/hostname`|g' \
                "$file"
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 860d049e8650..c1f9e198aafa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4608,11 +4608,7 @@ with pkgs;
     v8 = v8_static;
   };
 
-  rsnapshot = callPackage ../tools/backup/rsnapshot {
-    # For the `logger' command, we can use either `utillinux' or
-    # GNU Inetutils.  The latter is more portable.
-    logger = if stdenv.isLinux then utillinux else inetutils;
-  };
+  rsnapshot = callPackage ../tools/backup/rsnapshot { };
 
   rlwrap = callPackage ../tools/misc/rlwrap { };
 
@@ -7659,7 +7655,6 @@ with pkgs;
     inherit (perlPackages) perl
       ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey;
     inherit (llvmPackages_4) llvm clang-unwrapped;
-    utillinux = if stdenv.isLinux then utillinuxMinimal else null;
   };
 
   cscope = callPackage ../development/tools/misc/cscope { };
@@ -13091,7 +13086,7 @@ with pkgs;
     })
     else if stdenv.isLinux
     then utillinuxMinimal
-    else null;
+    else libossp_uuid;
 
   light = callPackage ../os-specific/linux/light { };
 
@@ -13099,8 +13094,6 @@ with pkgs;
 
   ebtables = callPackage ../os-specific/linux/ebtables { };
 
-  eject = utillinux;
-
   facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };
 
   fatrace = callPackage ../os-specific/linux/fatrace { };
@@ -14017,7 +14010,7 @@ with pkgs;
     ncurses = null;
     perl = null;
     systemd = null;
-  }) else throw "utillinux is unsupported on non-Linux";
+  }) else utillinux;
 
   v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
 
@@ -21142,5 +21135,5 @@ with pkgs;
 
   # Unix tools
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
-  inherit (unixtools) hexdump ps sysctl;
+  inherit (unixtools) hexdump ps logger eject modprobe umount mount wall hostname more;
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 13554ff6ee68..91e3581b6835 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7328,7 +7328,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-${version}.tgz";
       sha256 = "0ksldcw0hydfy9k70i6q6fm1wgbc54kx0lbwlkrszsbd7q72dlfg";
     };
-    propagatedBuildInputs = [pkgs.utillinux.bin]; # `more` used in tests
+    propagatedBuildInputs = [pkgs.more]; # `more` used in tests
   };
 
   IOPrompt = buildPerlPackage {
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 706cd061b591..0c6b9e261dd8 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -1,5 +1,15 @@
 { pkgs, buildEnv, runCommand, hostPlatform }:
 
+# These are some unix tools that are commonly included in the /usr/bin
+# and /usr/sbin directory under more normal distributions. Along with
+# coreutils, these are commonly assumed to be available by build
+# systems, but we can't assume they are available. In Nix, we list
+# each program by name directly through this unixtools attribute.
+
+# You should always try to use single binaries when available. For
+# instance, if your program needs to use "ps", just list it as a build
+# input, not "procps" which requires Linux.
+
 let
 
   singleBinary = cmd: providers:
@@ -17,10 +27,22 @@ let
     else throw "${hostPlatform.parsed.kernel.name} does not have ${cmd}";
 
 in rec {
+
+  # more is unavailable in darwin
+  # just use less
+  more_compat = runCommand "more" {} ''
+    mkdir -p $out/bin
+    ln -s ${pkgs.less}/bin/less $out/bin/more
+  '';
+
+  # singular binaries
   arp = singleBinary "arp" {
     linux = pkgs.nettools;
     darwin = pkgs.darwin.network_cmds;
   };
+  eject = singleBinary "eject" {
+    linux = pkgs.utillinux;
+  };
   getopt = singleBinary "getopt" {
     linux = pkgs.utillinux;
     darwin = pkgs.darwin.shell_cmds;
@@ -37,6 +59,19 @@ in rec {
     linux = pkgs.nettools;
     darwin = pkgs.darwin.network_cmds;
   };
+  logger = singleBinary "logger" {
+    linux = pkgs.utillinux;
+  };
+  modprobe = singleBinary "modprobe" {
+    linux = pkgs.utillinux;
+  };
+  more = singleBinary "more" {
+    linux = pkgs.utillinux;
+    darwin = pkgs.more_compat;
+  };
+  mount = singleBinary "mount" {
+    linux = pkgs.utillinux;
+  };
   netstat = singleBinary "netstat" {
     linux = pkgs.nettools;
     darwin = pkgs.darwin.network_cmds;
@@ -61,16 +96,23 @@ in rec {
     linux = pkgs.procps;
     darwin = pkgs.darwin.system_cmds;
   };
+  umount = singleBinary "umount" {
+    linux = pkgs.utillinux;
+  };
   whereis = singleBinary "whereis" {
     linux = pkgs.utillinux;
     darwin = pkgs.darwin.shell_cmds;
   };
+  wall = singleBinary "wall" {
+    linux = pkgs.utillinux;
+  };
   write = singleBinary "write" {
     linux = pkgs.utillinux;
     darwin = pkgs.darwin.basic_cmds;
   };
 
   # Compatibility derivations
+  # Provided for old usage of these commands.
 
   procps = buildEnv {
     name = "procps-compat";

From 80aec24b92707daf5ae2cd954e08ccd8c68ef3ad Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Mar 2018 12:33:34 -0500
Subject: [PATCH 116/119] Update default.nix

---
 pkgs/servers/apcupsd/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 5f0440fc6913..04285621e5c9 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man
-, utillinux
 , enableCgiScripts ? true, gd
 }:
 

From 00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Mar 2018 12:39:56 -0500
Subject: [PATCH 117/119] Cleanup all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1f9e198aafa..d7e581eff7ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13086,7 +13086,7 @@ with pkgs;
     })
     else if stdenv.isLinux
     then utillinuxMinimal
-    else libossp_uuid;
+    else null;
 
   light = callPackage ../os-specific/linux/light { };
 
@@ -21135,5 +21135,6 @@ with pkgs;
 
   # Unix tools
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
-  inherit (unixtools) hexdump ps logger eject modprobe umount mount wall hostname more;
+  inherit (unixtools) hexdump ps logger eject modprobe umount
+                      mount wall hostname more sysctl;
 }

From 11f0e07d4fc3791a3318950bc70bc53b2828af6b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Mar 2018 13:02:24 -0500
Subject: [PATCH 118/119] unixtools: replace darwin.ps

---
 pkgs/development/tools/build-managers/cmake/2.8.nix | 5 ++---
 pkgs/top-level/all-packages.nix                     | 9 ++-------
 pkgs/top-level/unix-tools.nix                       | 2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index fcf06782e4dd..c87fe1cc5ace 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2
-, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
+, useNcurses ? false, ncurses, useQt4 ? false, qt4
 , buildPlatform, hostPlatform
 }:
 
 with stdenv.lib;
 
-assert wantPS -> (ps != null);
 assert stdenv ? cc;
 assert stdenv.cc ? libc;
 
@@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
-  propagatedBuildInputs = optional wantPS ps;
+  propagatedBuildInputs = [ ps ];
 
   CMAKE_PREFIX_PATH = concatStringsSep ":"
     (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7e581eff7ed..961b6cdfe171 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7620,14 +7620,9 @@ with pkgs;
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
-  cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix {
-    wantPS = stdenv.isDarwin;
-    inherit (darwin) ps;
-  };
+  cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { };
 
-  cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake {
-    inherit (darwin) ps;
-  };
+  cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { };
 
   cmakeCurses = cmake.override { useNcurses = true; };
 
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 0c6b9e261dd8..ab807290b7c1 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -82,7 +82,7 @@ in rec {
   };
   ps = singleBinary "ps" {
     linux = pkgs.procps;
-    darwin = pkgs.darwin.adv_cmds;
+    darwin = pkgs.darwin.ps;
   };
   route = singleBinary "route" {
     linux = pkgs.nettools;

From 49455d7bae2f81c5c984faa6728c9017123fa798 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 27 Mar 2018 13:17:10 -0500
Subject: [PATCH 119/119] treewide: replace utillinux refs of {u,}mount

umount and mount are now provided top-level
---
 pkgs/development/tools/build-managers/cmake/2.8.nix | 2 +-
 pkgs/development/tools/misc/creduce/default.nix     | 2 --
 pkgs/development/tools/misc/csmith/default.nix      | 2 +-
 pkgs/servers/apcupsd/default.nix                    | 2 +-
 pkgs/servers/interlock/default.nix                  | 9 +++++----
 pkgs/servers/search/elasticsearch/2.x.nix           | 9 +++------
 pkgs/servers/search/elasticsearch/5.x.nix           | 9 +++------
 pkgs/servers/search/elasticsearch/6.x.nix           | 9 +++------
 pkgs/servers/search/elasticsearch/default.nix       | 9 +++------
 pkgs/top-level/all-packages.nix                     | 3 ---
 pkgs/top-level/unix-tools.nix                       | 4 ++--
 11 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index c87fe1cc5ace..5fcd6b341653 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2
-, useNcurses ? false, ncurses, useQt4 ? false, qt4
+, useNcurses ? false, ncurses, useQt4 ? false, qt4, ps
 , buildPlatform, hostPlatform
 }:
 
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index 37ec63627b15..cbf5883b2973 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -6,8 +6,6 @@
 , utillinux
 }:
 
-assert stdenv.isLinux -> (utillinux != null);
-
 stdenv.mkDerivation rec {
   name = "creduce-${version}";
   version = "2.7.0";
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix
index 9a8c24fa1685..c4994ad24d79 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/pkgs/development/tools/misc/csmith/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ m4 makeWrapper ];
-  buildInputs = [ libbsd perl SysCPU ];
+  buildInputs = [ perl SysCPU libbsd ];
 
   postInstall = ''
     substituteInPlace $out/bin/compiler_test.pl \
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 04285621e5c9..bec61d460a7a 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   # There is no real reason for a bin/sbin split, so just use bin.
   preConfigure = ''
     export ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown
-    export ac_cv_path_WALL=${utillinux}/bin/wall
+    export ac_cv_path_WALL=${wall}/bin/wall
     sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure
     export configureFlags="\
         --bindir=$out/bin \
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index a0b59d332a3f..0df055f9690f 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup,
-  buildGoPackage, fetchFromGitHub }:
+{ stdenv, lib, sudo, coreutils, systemd, cryptsetup
+, mount, umount
+, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "interlock-${version}";
@@ -23,8 +24,8 @@ buildGoPackage rec {
   buildFlags = [ "-tags textsecure" ];
   postPatch = ''
     grep -lr '/s\?bin/' | xargs sed -i \
-      -e 's|/bin/mount|${utillinux}/bin/mount|' \
-      -e 's|/bin/umount|${utillinux}/bin/umount|' \
+      -e 's|/bin/mount|${mount}/bin/mount|' \
+      -e 's|/bin/umount|${umount}/bin/umount|' \
       -e 's|/bin/cp|${coreutils}/bin/cp|' \
       -e 's|/bin/mv|${coreutils}/bin/mv|' \
       -e 's|/bin/chown|${coreutils}/bin/chown|' \
diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
index 30beec7b873d..28244d1b3dcd 100644
--- a/pkgs/servers/search/elasticsearch/2.x.nix
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
+{ stdenv, fetchurl, makeWrapper, jre, utillinux }:
 
 with stdenv.lib;
 
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ];
 
-  buildInputs = [ makeWrapper jre ] ++
-    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+  buildInputs = [ makeWrapper jre utillinux ];
 
   installPhase = ''
     mkdir -p $out
@@ -24,9 +23,7 @@ stdenv.mkDerivation rec {
     mv $out/bin/plugin $out/bin/elasticsearch-plugin
     wrapProgram $out/bin/elasticsearch \
       --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \
-      ${if (!stdenv.isDarwin)
-        then ''--prefix PATH : "${utillinux}/bin/"''
-        else ''--prefix PATH : "${getopt}/bin"''} \
+      --prefix PATH : "${utillinux}/bin" \
       --set JAVA_HOME "${jre}"
     wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}"
   '';
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
index 0d27e4fefcc8..f46ca9c0cb3f 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux, getopt }:
+{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux }:
 
 with stdenv.lib;
 
@@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
 
-  buildInputs = [ makeWrapper jre_headless ] ++
-    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+  buildInputs = [ makeWrapper jre_headless utillinux ];
 
   installPhase = ''
     mkdir -p $out
@@ -24,9 +23,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/elasticsearch \
       --prefix ES_CLASSPATH : "$out/lib/*" \
-      ${if (!stdenv.isDarwin)
-        then ''--prefix PATH : "${utillinux}/bin/"''
-        else ''--prefix PATH : "${getopt}/bin"''} \
+      --prefix PATH : "${utillinux}/bin" \
       --set JAVA_HOME "${jre_headless}" \
       --set ES_JVM_OPTIONS "$out/config/jvm.options"
 
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index 6057c2dee82c..5594fe35b737 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux, getopt }:
+{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux }:
 
 with stdenv.lib;
 
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
     sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env
   '';
 
-  buildInputs = [ makeWrapper jre_headless ] ++
-    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+  buildInputs = [ makeWrapper jre_headless utillinux ];
 
   installPhase = ''
     mkdir -p $out
@@ -27,9 +26,7 @@ stdenv.mkDerivation rec {
     chmod -x $out/bin/*.*
 
     wrapProgram $out/bin/elasticsearch \
-      ${if (!stdenv.isDarwin)
-        then ''--prefix PATH : "${utillinux}/bin/"''
-        else ''--prefix PATH : "${getopt}/bin"''} \
+      --prefix PATH : "${utillinux}/bin/" \
       --set JAVA_HOME "${jre_headless}" \
       --set ES_JVM_OPTIONS "$out/config/jvm.options"
 
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 16f010302902..f4780603f502 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
+{ stdenv, fetchurl, makeWrapper, jre, utillinux }:
 
 with stdenv.lib;
 
@@ -12,8 +12,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./es-home.patch ];
 
-  buildInputs = [ makeWrapper jre ] ++
-    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+  buildInputs = [ makeWrapper jre utillinux ];
 
   installPhase = ''
     mkdir -p $out
@@ -25,9 +24,7 @@ stdenv.mkDerivation rec {
     # set ES_CLASSPATH and JAVA_HOME
     wrapProgram $out/bin/elasticsearch \
       --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \
-      ${if (!stdenv.isDarwin)
-        then ''--prefix PATH : "${utillinux}/bin/"''
-        else ''--prefix PATH : "${getopt}/bin"''} \
+      --prefix PATH : "${utillinux}/bin" \
       --set JAVA_HOME "${jre}"
     wrapProgram $out/bin/elasticsearch-plugin \
       --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 961b6cdfe171..a3f388da1ee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7656,9 +7656,6 @@ with pkgs;
 
   csmith = callPackage ../development/tools/misc/csmith {
     inherit (perlPackages) perl SysCPU;
-    # Workaround optional dependency on libbsd that's
-    # currently broken on Darwin.
-    libbsd = if stdenv.isDarwin then null else libbsd;
   };
 
   csslint = callPackage ../development/web/csslint { };
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index ab807290b7c1..2e2cc3cea880 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -45,7 +45,7 @@ in rec {
   };
   getopt = singleBinary "getopt" {
     linux = pkgs.utillinux;
-    darwin = pkgs.darwin.shell_cmds;
+    darwin = pkgs.getopt;
   };
   hexdump = singleBinary "hexdump" {
     linux = pkgs.procps;
@@ -67,7 +67,7 @@ in rec {
   };
   more = singleBinary "more" {
     linux = pkgs.utillinux;
-    darwin = pkgs.more_compat;
+    darwin = more_compat;
   };
   mount = singleBinary "mount" {
     linux = pkgs.utillinux;