From d9f52b3aedda8c28e29ad360d90919bd1e4b71b5 Mon Sep 17 00:00:00 2001
From: CommunicationAnimale <communicationanimal2015@gmail.com>
Date: Sat, 19 May 2018 13:21:33 +0200
Subject: [PATCH 001/128] nixos/thinkfan: use non-deprecated keywords in config
 file.

---
 nixos/modules/services/hardware/thinkfan.nix | 53 +++++++++++++++++---
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index 5a898631e09..ef932440dd9 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -28,11 +28,15 @@ let
     # temperatures are read from the file.
     #
     # For example:
-    # sensor /proc/acpi/ibm/thermal (0, 0, 10)
+    # tp_thermal /proc/acpi/ibm/thermal (0, 0, 10)
     # will add a fixed value of 10 °C the 3rd value read from that file. Check out
     # http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may
     # want to add to certain temperatures.
     
+
+    ${cfg.fan}
+    ${cfg.sensors}
+
     #  Syntax:
     #  (LEVEL, LOW, HIGH)
     #  LEVEL is the fan level to use (0-7 with thinkpad_acpi)
@@ -41,8 +45,6 @@ let
     #  All numbers are integers.
     #
 
-    sensor ${cfg.sensor} (0, 10, 15, 2, 10, 5, 0, 3, 0, 3)
-    
     ${cfg.levels}
   '';
 
@@ -59,10 +61,42 @@ in {
         '';
       };
 
-      sensor = mkOption {
-        default = "/proc/acpi/ibm/thermal";
+      sensors = mkOption {
+        default = ''
+          tp_thermal /proc/acpi/ibm/thermal (0,0,10)
+        '';
+        description =''
+          thinkfan can read temperatures from three possible sources:
+
+            /proc/acpi/ibm/thermal
+              Which is provided by the thinkpad_acpi kernel
+              module (keyword tp_thermal)
+
+            /sys/class/hwmon/*/temp*_input
+              Which may be provided by any hwmon drivers (keyword
+              hwmon)
+
+            S.M.A.R.T. (since 0.9 and requires the USE_ATASMART compilation flag)
+              Which reads the temperature directly from the hard
+              disk using libatasmart (keyword atasmart)
+          Multiple sensors may be added, in which case they will be
+          numbered in their order of appearance.
+        '';
+      };
+
+      fan = mkOption {
+        default = "tp_fan /proc/acpi/ibm/fan";
         description =''
-          Sensor used by thinkfan
+          Specifies the fan we want to use.
+          On anything other than a Thinkpad you'll probably
+          use some PWM control file in /sys/class/hwmon.
+          Remember that fan levels range from 0 to 255 and that
+          they're just a number, not including the word "level"
+          as seen below.
+          A sysfs fan would be specified like this:
+            pwm_fan /sys/class/hwmon/hwmon2/device/pwm1
+
+          Remember you can only have one fan.
         '';
       };
 
@@ -77,7 +111,12 @@ in {
           (127,   80,     32767)
         '';
         description =''
-          Sensor used by thinkfan
+					Syntax:
+					(LEVEL, LOW, HIGH)
+					LEVEL is the fan level to use (0-7 with thinkpad_acpi)
+					LOW is the temperature at which to step down to the previous level
+					HIGH is the temperature at which to step up to the next level
+					All numbers are integers.
         '';
       };
 
-- 
GitLab


From ff28a91663c3f8f131de54f107b6eca6456891c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 13 Jul 2018 00:53:09 -0700
Subject: [PATCH 002/128] nomacs: 3.10.0 -> 3.10.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nomacs/versions.
---
 pkgs/applications/graphics/nomacs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 1103c9ff40a..4093c151319 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -18,12 +18,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.10.0";
+  version = "3.10.2";
   src = fetchFromGitHub {
     owner = "nomacs";
     repo = "nomacs";
     rev = version;
-    sha256 = "07k921r4m6p5kicyb55zdfp58m8mlc94g2csq354d7v20m71zwrv";
+    sha256 = "0v2gsdc8caswf2b5aa023d8kil1fqf4r9mlg15180h3c92f8jzvh";
   };
 
   name = "nomacs-${version}";
-- 
GitLab


From a16b7dfb6a7fe8c9fead846751ed738e7faaadf4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 13 Jul 2018 23:39:17 -0500
Subject: [PATCH 003/128] hpc-coveralls: patch to fix build (for Cabal 2.2)

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c7e7cd4f4c3..dce0aa1dbac 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1100,4 +1100,10 @@ self: super: {
   unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
   # dontCheck: printf double rounding behavior
   prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter;
+
+  # Fix with Cabal 2.2, https://github.com/guillaume-nargeot/hpc-coveralls/pull/73
+  hpc-coveralls = appendPatch super.hpc-coveralls (pkgs.fetchpatch {
+    url = "https://github.com/guillaume-nargeot/hpc-coveralls/pull/73/commits/344217f513b7adfb9037f73026f5d928be98d07f.patch";
+    sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j";
+  });
 }
-- 
GitLab


From 0c085fd034e420e4633ba2ac5192de726bb48547 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:26:26 +0000
Subject: [PATCH 004/128] ocamlPackages.astring: remove spurious dependency to
 camlp4

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

diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix
index 97c59d8581f..827487be69b 100644
--- a/pkgs/development/ocaml-modules/astring/default.nix
+++ b/pkgs/development/ocaml-modules/astring/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
 
-buildOcaml rec {
+stdenv.mkDerivation rec {
   version = "0.8.3";
-  name = "astring";
+  name = "ocaml${ocaml.version}-astring-${version}";
 
   src = fetchurl {
     url = "http://erratique.ch/software/astring/releases/astring-${version}.tbz";
-- 
GitLab


From ba612369e7f83db6b14ab93a6af9c7db3201fa1f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:26:39 +0000
Subject: [PATCH 005/128] ocamlPackages.ipaddr: remove spurious dependency to
 camlp4

---
 pkgs/development/ocaml-modules/ipaddr/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
index 20d558e37c1..2f0aa342995 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, buildOcaml, fetchurl, ocamlbuild, findlib
+{ stdenv, fetchurl, ocaml, ocamlbuild, findlib
 , jbuilder, sexplib, ppx_sexp_conv
 }:
 
-buildOcaml rec {
-  name = "ipaddr";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ipaddr-${version}";
   version = "2.8.0";
 
   src = fetchurl {
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw";
   };
 
-  buildInputs = [ findlib ocamlbuild jbuilder ];
+  buildInputs = [ ocaml findlib ocamlbuild jbuilder ];
   propagatedBuildInputs = [ ppx_sexp_conv sexplib ];
 
   inherit (jbuilder) installPhase;
-- 
GitLab


From 1c58618fd12182ef081f187e0b1a1136b85c4a53 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:26:50 +0000
Subject: [PATCH 006/128] ocamlPackages.ppx_deriving: remove spurious
 dependency to camlp4

---
 .../ocaml-modules/ppx_deriving/default.nix    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index 3afe4149fa3..24cfbcf5b7a 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -1,7 +1,11 @@
-{ stdenv, buildOcaml, ocaml, fetchzip
+{ stdenv, ocaml, findlib, ocamlbuild, fetchzip
 , cppo, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree
 }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "ppx_deriving is not available for OCaml ${ocaml.version}"
+else
+
 let param =
   if ocaml.version == "4.03.0"
   then {
@@ -14,23 +18,21 @@ let param =
     extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ];
 }; in
 
-buildOcaml rec {
-  name = "ppx_deriving";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ppx_deriving-${version}";
   inherit (param) version;
 
-  minimumSupportedOcamlVersion = "4.02";
-
   src = fetchzip {
-    url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz";
+    url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz";
     inherit (param) sha256;
   };
 
-  hasSharedObjects = true;
-
-  buildInputs = [ cppo ounit ];
+  buildInputs = [ ocaml findlib ocamlbuild cppo ounit ];
   propagatedBuildInputs = param.extraPropagatedBuildInputs ++
     [ ppx_tools result ];
 
+  createFindlibDestdir = true;
+
   installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install";
 
   meta = with stdenv.lib; {
-- 
GitLab


From d534882ca27789c000fd0b17088ae39d1b566cd4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:27:00 +0000
Subject: [PATCH 007/128] ocamlPackages.ppx_tools: enable for OCaml 4.07

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

diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 53d7847acee..2aa74d751db 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -17,6 +17,9 @@ let param = {
   "4.06" = {
     version = "5.1+4.06.0";
     sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
+  "4.07" = {
+    version = "5.1+4.06.0";
+    sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
 }."${ocaml.meta.branch}";
 in
   stdenv.mkDerivation {
-- 
GitLab


From fdf291f92270a378f04cda6da330970c1c88e021 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:27:11 +0000
Subject: [PATCH 008/128] ocamlPackages.tyxml: make dependency to camlp4
 optional

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

diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
index a965d6ed116..b34c9279c30 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camlp4, uutf, markup, ppx_tools_versioned, re
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re
+, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07"
+, camlp4 ? null
 }:
 
 assert stdenv.lib.versionAtLeast ocaml.version "4.02";
@@ -13,13 +15,14 @@ stdenv.mkDerivation rec {
     sha256 = "1zrkrmxyj5a2cdh4b9zr9anwfk320wv3x0ynxnyxl5za2ix8sld8";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild camlp4 ppx_tools_versioned markup ];
+  buildInputs = [ ocaml findlib ocamlbuild ppx_tools_versioned markup ]
+  ++ stdenv.lib.optional withP4 camlp4;
 
   propagatedBuildInputs = [ uutf re ];
 
   createFindlibDestdir = true;
 
-  configureFlags = "--enable-syntax";
+  configureFlags = stdenv.lib.optional withP4 "--enable-syntax";
 
   meta = with stdenv.lib; {
     homepage = http://ocsigen.org/tyxml/;
-- 
GitLab


From 6d9ffeaa2ec4816bc432e7d28b5aa85165562740 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Jul 2018 08:27:25 +0000
Subject: [PATCH 009/128] ocamlPackages.js_of_ocaml: 3.1.0 -> 3.2.0

---
 pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 4 ++--
 pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index 6d269552f62..79801304595 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -8,13 +8,13 @@ else
 
 stdenv.mkDerivation rec {
 	name = "js_of_ocaml-compiler-${version}";
-	version = "3.1.0";
+	version = "3.2.0";
 
 	src = fetchFromGitHub {
 		owner = "ocsigen";
 		repo = "js_of_ocaml";
 		rev = version;
-		sha256 = "17a0kb39bcx2qq41cq7kjrxghm67l1yahrs47yakgb1avna0pqd9";
+		sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv";
 	};
 
 	buildInputs = [ ocaml findlib jbuilder cmdliner cppo ];
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index 31a5c3ea17b..5ec8cca344d 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -1,6 +1,6 @@
 { stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx
 , ocaml-migrate-parsetree, ppx_tools_versioned
-, js_of_ocaml, ocaml_lwt
+, js_of_ocaml, ocaml_lwt, lwt_log
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
 
-	propagatedBuildInputs = [ js_of_ocaml ocaml_lwt ];
+	propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
 
 	buildPhase = "jbuilder build -p js_of_ocaml-lwt";
 }
-- 
GitLab


From 92c82e0933a0b3caa73226555c5c8d6d2f516538 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 15 Jul 2018 23:28:14 +0200
Subject: [PATCH 010/128] nixos/thinkfan: add types & fix formatting

---
 nixos/modules/services/hardware/thinkfan.nix | 24 +++++++++-----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index ef932440dd9..d17121ca1c5 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -32,7 +32,6 @@ let
     # will add a fixed value of 10 °C the 3rd value read from that file. Check out
     # http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may
     # want to add to certain temperatures.
-    
 
     ${cfg.fan}
     ${cfg.sensors}
@@ -55,6 +54,7 @@ in {
     services.thinkfan = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads.
@@ -62,6 +62,7 @@ in {
       };
 
       sensors = mkOption {
+        type = types.lines;
         default = ''
           tp_thermal /proc/acpi/ibm/thermal (0,0,10)
         '';
@@ -79,28 +80,26 @@ in {
             S.M.A.R.T. (since 0.9 and requires the USE_ATASMART compilation flag)
               Which reads the temperature directly from the hard
               disk using libatasmart (keyword atasmart)
+
           Multiple sensors may be added, in which case they will be
           numbered in their order of appearance.
         '';
       };
 
       fan = mkOption {
+        type = types.str;
         default = "tp_fan /proc/acpi/ibm/fan";
         description =''
           Specifies the fan we want to use.
           On anything other than a Thinkpad you'll probably
           use some PWM control file in /sys/class/hwmon.
-          Remember that fan levels range from 0 to 255 and that
-          they're just a number, not including the word "level"
-          as seen below.
           A sysfs fan would be specified like this:
             pwm_fan /sys/class/hwmon/hwmon2/device/pwm1
-
-          Remember you can only have one fan.
         '';
       };
 
       levels = mkOption {
+        type = types.lines;
         default = ''
           (0,     0,      55)
           (1,     48,     60)
@@ -110,13 +109,12 @@ in {
           (7,     60,     85)
           (127,   80,     32767)
         '';
-        description =''
-					Syntax:
-					(LEVEL, LOW, HIGH)
-					LEVEL is the fan level to use (0-7 with thinkpad_acpi)
-					LOW is the temperature at which to step down to the previous level
-					HIGH is the temperature at which to step up to the next level
-					All numbers are integers.
+        description = ''
+          (LEVEL, LOW, HIGH)
+          LEVEL is the fan level to use (0-7 with thinkpad_acpi).
+          LOW is the temperature at which to step down to the previous level.
+          HIGH is the temperature at which to step up to the next level.
+          All numbers are integers.
         '';
       };
 
-- 
GitLab


From fe69ee86c8a7659c6bd961827ff1f952abdabfcd Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Sat, 14 Jul 2018 22:33:24 +1000
Subject: [PATCH 011/128] Fix Synergy building on macOS

Update gtest and gmock to fix clang compiler issues, as well as patch
CMakeLists.txt in multiple places to fix other issues on macOS.
---
 pkgs/applications/misc/synergy/default.nix    |  46 +++--
 .../misc/synergy/respect_macos_arch.patch     |  61 +++++++
 .../misc/synergy/update_gtest_gmock.patch     | 158 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   5 +-
 4 files changed, 254 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/applications/misc/synergy/respect_macos_arch.patch
 create mode 100644 pkgs/applications/misc/synergy/update_gtest_gmock.patch

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index ee3cb9cd8ed..5f12bdb4dfc 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
-, xinput, curl, openssl, unzip }:
-
-with stdenv.lib;
+{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper
+, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver
+, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "synergy-${version}";
@@ -14,17 +13,33 @@ stdenv.mkDerivation rec {
     sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
   };
 
-  patches = [ ./openssl-1.1.patch ];
+  patches = [./openssl-1.1.patch ./update_gtest_gmock.patch
+  ] ++ lib.optional stdenv.isDarwin ./respect_macos_arch.patch;
 
   patch_gcc6 = fetchpatch {
     url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch;
     sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d";
   };
 
+  # Due to the included gtest and gmock not supporting clang
+  # we replace it with 1.7.0 for synergy-1.8.8. This should
+  # become unnecessary when we update to a newer version of Synergy.
+  gmock_zip = fetchurl {
+    url = https://github.com/google/googlemock/archive/release-1.7.0.zip;
+    sha256 = "11bd04098rzamv7f9y01zaf9c8zrmzdk6g1qrlwq780pxzlr4ya0";
+  };
+
+  gtest_zip = fetchurl {
+    url = https://github.com/google/googletest/archive/release-1.7.0.zip;
+    sha256 = "1l5n6kzdypjzjrz2jh14ylzrx735lccfx2p3s4ccgci8g9abg35m";
+  };
+
   postPatch = ''
-    ${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
-    ${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
-    patch -d ext/gmock-1.6.0 -p1 -i ${patch_gcc6}
+    ${unzip}/bin/unzip -d ext/ ${gmock_zip}
+    ${unzip}/bin/unzip -d ext/ ${gtest_zip}
+    mv ext/googlemock-release-1.7.0 ext/gmock-1.7.0
+    mv ext/googletest-release-1.7.0 ext/gtest-1.7.0
+    patch -d ext/gmock-1.7.0 -p1 -i ${patch_gcc6}
   ''
     # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt
     # it's not able to find it (it's trying to search the store path of libX11
@@ -38,15 +53,19 @@ stdenv.mkDerivation rec {
     #   Looking for XRRNotifyEvent - not found
     #
     # So let's force it:
-  + optionalString stdenv.isLinux ''
+  + lib.optionalString stdenv.isLinux ''
     sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
       set(HAVE_X11_EXTENSIONS_XRANDR_H true)
     ' CMakeLists.txt
   '';
 
+  cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ];
+
   buildInputs = [
-    cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl
-  ];
+    cmake curl openssl
+  ] ++ lib.optionals stdenv.isDarwin [
+    ApplicationServices Carbon Cocoa CoreServices ScreenSaver
+  ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -58,12 +77,11 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = "../bin/unittests";
 
-  meta = {
+  meta = with lib; {
     description = "Share one mouse and keyboard between multiple computers";
     homepage = http://synergy-project.org/;
     license = licenses.gpl2;
-    maintainers = [ maintainers.aszlig ];
+    maintainers = with maintainers; [ aszlig enzime ];
     platforms = platforms.all;
-    broken = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/applications/misc/synergy/respect_macos_arch.patch b/pkgs/applications/misc/synergy/respect_macos_arch.patch
new file mode 100644
index 00000000000..003d7d22421
--- /dev/null
+++ b/pkgs/applications/misc/synergy/respect_macos_arch.patch
@@ -0,0 +1,61 @@
+From 944177c76d4c7ff5ef3460eab28286a45344a0e7 Mon Sep 17 00:00:00 2001
+From: Michael Hoang <enzime@users.noreply.github.com>
+Date: Sat, 14 Jul 2018 21:56:59 +1000
+Subject: [PATCH 2/2] Make sure CMake respects the current arch on macOS
+
+Only set the macOS architecture if not defined by the user. Use the
+OpenSSL libraries and headers from Nix on macOS to prevent architecture
+mismatches.
+---
+ CMakeLists.txt     |  2 +-
+ src/CMakeLists.txt | 14 +-------------
+ 2 files changed, 2 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2f37424d..c7217e28 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -172,7 +172,7 @@ if (UNIX)
+ 			# <= 10.5: 32-bit Intel and PowerPC
+ 			set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
+ 				CACHE STRING "" FORCE)
+-		else()
++		elseif (NOT CMAKE_OSX_ARCHITECTURES)
+ 			# >= 10.6: Intel only
+ 			set(CMAKE_OSX_ARCHITECTURES "i386"
+ 				CACHE STRING "" FORCE)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 237ba484..04428636 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -23,11 +23,6 @@ if (WIN32)
+ 	set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32)
+ endif()
+ 
+-if (APPLE)
+-	set(OPENSSL_PLAT_DIR openssl-osx)
+-	set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include)
+-endif()
+-
+ if (WIN32)
+ 	set(OPENSSL_LIBS
+ 		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
+@@ -36,14 +31,7 @@ if (WIN32)
+ endif()
+ 
+ if (UNIX)
+-	if (APPLE)
+-		set(OPENSSL_LIBS
+-		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a
+-		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a
+-		)
+-	else()
+-		set(OPENSSL_LIBS ssl crypto)
+-	endif()
++	set(OPENSSL_LIBS ssl crypto)
+ endif()
+ 
+ add_subdirectory(lib)
+-- 
+2.17.1
+
diff --git a/pkgs/applications/misc/synergy/update_gtest_gmock.patch b/pkgs/applications/misc/synergy/update_gtest_gmock.patch
new file mode 100644
index 00000000000..87b53e78585
--- /dev/null
+++ b/pkgs/applications/misc/synergy/update_gtest_gmock.patch
@@ -0,0 +1,158 @@
+From eea85dbf4bbde545d8cb07d7ee9fbdca3dcf48fd Mon Sep 17 00:00:00 2001
+From: Michael Hoang <enzime@users.noreply.github.com>
+Date: Sat, 14 Jul 2018 22:07:39 +1000
+Subject: [PATCH 1/2] Update gtest and gmock to version 1.7.0
+
+Fixes compilation under clang on macOS as <tr1/tuple> is now found under
+<tuple>.
+---
+ CMakeLists.txt                     |  2 +-
+ ext/toolchain/commands1.py         |  4 ++--
+ src/lib/platform/CMakeLists.txt    |  2 +-
+ src/lib/server/CMakeLists.txt      |  2 +-
+ src/lib/shared/CMakeLists.txt      |  2 +-
+ src/lib/synergy/CMakeLists.txt     |  2 +-
+ src/test/CMakeLists.txt            | 12 ++++++------
+ src/test/integtests/CMakeLists.txt |  4 ++--
+ src/test/unittests/CMakeLists.txt  |  4 ++--
+ 9 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 94c474e8..2f37424d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -178,7 +178,7 @@ if (UNIX)
+ 				CACHE STRING "" FORCE)
+ 		endif()
+ 		
+-		set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
++		set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")
+ 
+ 		find_library(lib_ScreenSaver ScreenSaver)
+ 		find_library(lib_IOKit IOKit)
+diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py
+index f32ec483..bf997cf6 100644
+--- a/ext/toolchain/commands1.py
++++ b/ext/toolchain/commands1.py
+@@ -251,10 +251,10 @@ class InternalCommands:
+ 	macIdentity = None
+ 	
+ 	# gtest dir with version number
+-	gtestDir = 'gtest-1.6.0'
++	gtestDir = 'gtest-1.7.0'
+ 	
+ 	# gmock dir with version number
+-	gmockDir = 'gmock-1.6.0'
++	gmockDir = 'gmock-1.7.0'
+ 
+ 	win32_generators = {
+ 		1 : VisualStudioGenerator('10'),
+diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
+index 481d8ef9..1ce67eca 100644
+--- a/src/lib/platform/CMakeLists.txt
++++ b/src/lib/platform/CMakeLists.txt
+@@ -31,7 +31,7 @@ endif()
+ 
+ include_directories(
+ 	../
+-	../../../ext/gtest-1.6.0/include
++	../../../ext/gtest-1.7.0/include
+ )
+ 
+ if (UNIX)
+diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt
+index 3cb582ec..0525d627 100644
+--- a/src/lib/server/CMakeLists.txt
++++ b/src/lib/server/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+ include_directories(
+ 	../
+ 	../../../ext
+-	../../../ext/gtest-1.6.0/include
++	../../../ext/gtest-1.7.0/include
+ )
+ 
+ if (UNIX)
+diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt
+index 891f4aa7..16c8b04a 100644
+--- a/src/lib/shared/CMakeLists.txt
++++ b/src/lib/shared/CMakeLists.txt
+@@ -25,7 +25,7 @@ add_library(shared STATIC ${sources})
+ include_directories(
+ 	../
+ 	../../../ext
+-	../../../ext/gtest-1.6.0/include
++	../../../ext/gtest-1.7.0/include
+ )
+ 
+ target_link_libraries(shared arch base)
+diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt
+index 0972be8c..e19fcce5 100644
+--- a/src/lib/synergy/CMakeLists.txt
++++ b/src/lib/synergy/CMakeLists.txt
+@@ -36,7 +36,7 @@ endif()
+ include_directories(
+ 	../
+ 	../../../ext
+-	../../../ext/gtest-1.6.0/include
++	../../../ext/gtest-1.7.0/include
+ )
+ 
+ if (UNIX)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index 8812150a..04cdfc50 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -15,13 +15,13 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ include_directories(
+-	../../ext/gtest-1.6.0
+-	../../ext/gtest-1.6.0/include
+-	../../ext/gmock-1.6.0
+-	../../ext/gmock-1.6.0/include)
++	../../ext/gtest-1.7.0
++	../../ext/gtest-1.7.0/include
++	../../ext/gmock-1.7.0
++	../../ext/gmock-1.7.0/include)
+ 	
+-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc)
++add_library(gtest STATIC ../../ext/gtest-1.7.0/src/gtest-all.cc)
++add_library(gmock STATIC ../../ext/gmock-1.7.0/src/gmock-all.cc)
+ 
+ if (UNIX)
+ 	# ignore warnings in gtest and gmock
+diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
+index 2f1ca7f3..6ddbd29a 100644
+--- a/src/test/integtests/CMakeLists.txt
++++ b/src/test/integtests/CMakeLists.txt
+@@ -56,8 +56,8 @@ endif()
+ include_directories(
+ 	../../
+ 	../../lib/
+-	../../../ext/gtest-1.6.0/include
+-	../../../ext/gmock-1.6.0/include
++	../../../ext/gtest-1.7.0/include
++	../../../ext/gmock-1.7.0/include
+ )
+ 
+ if (UNIX)
+diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
+index 3e49dc3c..5f6c4fac 100644
+--- a/src/test/unittests/CMakeLists.txt
++++ b/src/test/unittests/CMakeLists.txt
+@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources})
+ include_directories(
+ 	../../
+ 	../../lib/
+-	../../../ext/gtest-1.6.0/include
+-	../../../ext/gmock-1.6.0/include
++	../../../ext/gtest-1.7.0/include
++	../../../ext/gmock-1.7.0/include
+ 	../../../ext
+ )
+ 
+-- 
+2.17.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e19059be2a..94cc7c9b650 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18416,8 +18416,9 @@ with pkgs;
 
   syncthing-tray = callPackage ../applications/misc/syncthing-tray { };
 
-  # linux only by now
-  synergy = callPackage ../applications/misc/synergy { };
+  synergy = callPackage ../applications/misc/synergy {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver;
+  };
 
   tabbed = callPackage ../applications/window-managers/tabbed {
     # if you prefer a custom config, write the config.h in tabbed.config.h
-- 
GitLab


From 9210adeb0dd43247d1261a9aad98ab3ce2aed98f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 17 Jul 2018 07:59:04 -0700
Subject: [PATCH 012/128] zimg: 2.7.4 -> 2.7.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/zimg/versions.
---
 pkgs/development/libraries/zimg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index f67964748dc..9d006527717 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec{
   name = "zimg-${version}";
-  version = "2.7.4";
+  version = "2.7.5";
 
   src = fetchFromGitHub {
     owner  = "sekrit-twc";
     repo   = "zimg";
     rev    = "release-${version}";
-    sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci";
+    sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 4d6f88067c465c39539b7a4b47cdd6ac471a6292 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 18 Jul 2018 03:13:41 +0900
Subject: [PATCH 013/128] oraclejdk: 8u171, 8u172 -> 8u181

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 10 +++++-----
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index bdd367ef352..55faf277b15 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,11 +1,11 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "171";
+  patchVersion = "181";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p";
-  sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn";
-  sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0";
-  sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7";
+  sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
+  sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
+  sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
+  sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 901eea0f8f1..55faf277b15 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,11 +1,11 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "172";
+  patchVersion = "181";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256.i686-linux = "0csskx8xis0dr1948j76fgrwwsj4gzdbjqfi7if4v4j62b9i0hqa";
-  sha256.x86_64-linux = "0inkx73rwv7cvn9lqcr3hmnm0sr89h1fh29yamikb4dn02a0p818";
-  sha256.armv7l-linux = "1576cb0rlc42dsnmh388gy1wjas7ac6g135s8h74x8sm4b56qpln";
-  sha256.aarch64-linux = "0zpkmq8zxmpifawj611fg67srki63haz02rm6xwfc5qm2lxx5g6s";
+  sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
+  sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
+  sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
+  sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
-- 
GitLab


From 9fb190de50fabf597aaed9efbd09d8432c17941e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 17 Jul 2018 19:57:24 -0700
Subject: [PATCH 014/128] rcm: 1.3.1 -> 1.3.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rcm/versions.
---
 pkgs/tools/misc/rcm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix
index db68fab75ab..11ac0fc1419 100644
--- a/pkgs/tools/misc/rcm/default.nix
+++ b/pkgs/tools/misc/rcm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rcm-${version}";
-  version = "1.3.1";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz";
-    sha256 = "9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f";
+    sha256 = "1bqk7rrp1ckzvsvl9wghsr77m8xl3a7yc5gqdsisz492dx2j8mck";
   };
 
   patches = [ ./fix-rcmlib-path.patch ];
-- 
GitLab


From d5c9d86b830eb286ffacb9e090c31a3f4534912c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 07:46:21 -0700
Subject: [PATCH 015/128] s3cmd: 2.0.1 -> 2.0.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/s3cmd/versions.
---
 pkgs/tools/networking/s3cmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index c3d60d8e87b..e74a3554dc2 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -2,13 +2,13 @@
 
 python2Packages.buildPythonApplication rec {
   name = "s3cmd-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
   
   src = fetchFromGitHub {
     owner  = "s3tools";
     repo   = "s3cmd";
     rev    = "v${version}";
-    sha256 = "198hzzplci57sb8hdan30nbakslawmijfw0j71wjvq85n3xn6qsl";
+    sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk";
   };
 
   propagatedBuildInputs = with python2Packages; [ python_magic dateutil ];
-- 
GitLab


From a73049b1756c115fec19b9acb5134c20fda98935 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 08:50:12 -0700
Subject: [PATCH 016/128] playerctl: 0.6.0 -> 0.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/playerctl/versions.
---
 pkgs/tools/audio/playerctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index b8f39a03083..d2a7358ff8f 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "playerctl-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "playerctl";
     rev = "v${version}";
-    sha256 = "1sxy87syrfk485f2x556rl567j6rph4ss0xahf04bv26bzj3mqrp";
+    sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From d59c3849a41a7eb467a7f31f7127b809d9fbfb25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 09:24:09 -0700
Subject: [PATCH 017/128] opensubdiv: 3.3.1 -> 3.3.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opensubdiv/versions.
---
 pkgs/development/libraries/opensubdiv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 62c093f310f..157723c13ac 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensubdiv-${version}";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
     rev = "v${lib.replaceChars ["."] ["_"] version}";
-    sha256 = "1s96038yvf8wch5gv537iigqflxx7rh9wwn3wlrk8f9yfdwv1mk1";
+    sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 2ee14993255dfbb200c0dcc76875d60a31b5c5ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 09:50:59 -0700
Subject: [PATCH 018/128] neomutt: 20180622 -> 20180716

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neomutt/versions.
---
 .../applications/networking/mailreaders/neomutt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 33ccec35511..f082c241a64 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -15,14 +15,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20180622";
+  version = "20180716";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "0rwrxghsxbkbkdyi0544nglip8ri2xi8fn15m0wg5hg52xzcq40i";
+    sha256 = "0im2kkahkr04q04irvcimfawxi531ld6wrsa92r2m7l10gmijkl8";
   };
 
   buildInputs = [
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
       --replace /etc/mime.types ${mime-types}/etc/mime.types
 
     # The string conversion tests all fail with the first version of neomutt
-    # that has tests (20180223) as well as 20180622 so we disable them for now.
+    # that has tests (20180223) as well as 20180716 so we disable them for now.
     # I don't know if that is related to the tests or our build environment.
     # Try again with a later release.
     sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c
-- 
GitLab


From c33eb38d8a7446ba3c9ca00fe563253f00f2f618 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 10:07:36 -0700
Subject: [PATCH 019/128] mate.mate-panel: 1.21.0 -> 1.21.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mate-panel/versions.
---
 pkgs/desktops/mate/mate-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index c0c3cd48376..92da012ca7d 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-panel-${version}";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0vn523jscmxhyv80fmrnvk1wmyp4kdzr4g7yypqnsg4kg2gmr7x0";
+    sha256 = "0093pimqkx5db2nciksgrmq02hldg08p7hghafky3njl0kzv8l5z";
   };
 
   nativeBuildInputs = [
-- 
GitLab


From 3c6a9e13a9810530566a29d33cc2534282b569e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 10:26:17 -0700
Subject: [PATCH 020/128] mrtg: 2.17.4 -> 2.17.7

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mrtg/versions.
---
 pkgs/tools/misc/mrtg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix
index 7657b072aa8..26fcea669c2 100644
--- a/pkgs/tools/misc/mrtg/default.nix
+++ b/pkgs/tools/misc/mrtg/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
 
-  version = "2.17.4";
+  version = "2.17.7";
   name = "mrtg-${version}";
 
   src = fetchurl {
     url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz";
-    sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy";
+    sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v";
   };
 
   buildInputs = [
-- 
GitLab


From 7847ae02d842d98387aebe1623734e3838e28364 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 10:38:17 -0700
Subject: [PATCH 021/128] mutt: 1.10.0 -> 1.10.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mutt/versions.
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 81cf4541222..f2c097a4375 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582";
+    sha256 = "182lkbkpd3q3l1x6bvyds90ycp38gyyxhf35ry0d3hwf2n1khjkk";
   };
 
   patches = optional smimeSupport (fetchpatch {
-- 
GitLab


From 8a1f77fe2d6934083f95fa12fc6a814932e0975c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 11:28:23 -0700
Subject: [PATCH 022/128] libsvm: 3.22 -> 3.23

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsvm/versions.
---
 pkgs/development/libraries/libsvm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix
index aab0da90d39..6eb8b6b1a8e 100644
--- a/pkgs/development/libraries/libsvm/default.nix
+++ b/pkgs/development/libraries/libsvm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libsvm-${version}";
-  version = "3.22";
+  version = "3.23";
 
   src = fetchurl {
     url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz";
-    sha256 = "0zd7s19y5vb7agczl6456bn45cj1y64739sslaskw1qk7dywd0bd";
+    sha256 = "0jpaq0rr92x38p4nk3gjan79ip67m6p80anb28z1d8601miysyi5";
   };
 
   buildPhase = ''
-- 
GitLab


From f98790da415e8ee644be21b38a522b5b43da2801 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 13:13:48 -0700
Subject: [PATCH 023/128] krita: 4.1.0 -> 4.1.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/krita/versions.
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 1fd19162a4f..94a891ededd 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,11 +10,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "1mbyybc7h3sblbaklvz0cci3ys4zcyi616fgdn06p62v2vw2sybq";
+    sha256 = "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
-- 
GitLab


From cb955845a03bc7ce524464d35b513ac9fd6b8459 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 14:58:42 -0700
Subject: [PATCH 024/128] guake: 3.3.0 -> 3.3.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/guake/versions.
---
 pkgs/applications/misc/guake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 57dc68263ac..8bf779185b3 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -2,7 +2,7 @@
 , gtk3, keybinder3, libnotify, libutempter, vte }:
 
 let
-  version = "3.3.0";
+  version = "3.3.2";
 in python3.pkgs.buildPythonApplication rec {
   name = "guake-${version}";
   format = "other";
@@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec {
     owner = "Guake";
     repo = "guake";
     rev = version;
-    sha256 = "1wckzz18rpgacnkynh4rknhhki52agd76i2p80kk9rlrdifqs788";
+    sha256 = "0cz58wfsa66j01sqpka7908ilj5ch3jdxaxzqdi8yspqwzz5iwc7";
   };
 
   nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];
-- 
GitLab


From 6f7773cc2ad5383172f4ef3de934cf2edf5beef0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 15:14:22 -0700
Subject: [PATCH 025/128] esptool-ck: 0.4.11 -> 0.4.13

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/esptool-ck/versions.
---
 pkgs/tools/misc/esptool-ck/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix
index c1678f3907f..9d3b796c879 100644
--- a/pkgs/tools/misc/esptool-ck/default.nix
+++ b/pkgs/tools/misc/esptool-ck/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "esptool-ck-${version}";
-  version = "0.4.11";
+  version = "0.4.13";
 
   src = fetchFromGitHub {
     owner = "igrr";
     repo = "esptool-ck";
-    rev = "0.4.11";
-    sha256 = "086x68jza24xkaap8nici18kj78id2p2lzbasin98wilvpjc8d7f";
+    rev = "0.4.13";
+    sha256 = "1cb81b30a71r7i0gmkh2qagfx9lhq0myq5i37fk881bq6g7i5n2k";
   };
 
   makeFlags = [ "VERSION=${version}" ];
-- 
GitLab


From def83ddf4d87b241f1557cf8a893af06db48d946 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 18 Jul 2018 22:33:16 +0000
Subject: [PATCH 026/128] xfce4-13.mousepad: 0.4.0 -> 0.4.1

---
 pkgs/desktops/xfce4-13/default.nix          | 4 +---
 pkgs/desktops/xfce4-13/mousepad/default.nix | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix
index 451322bcaf9..6db207a79c5 100644
--- a/pkgs/desktops/xfce4-13/default.nix
+++ b/pkgs/desktops/xfce4-13/default.nix
@@ -19,9 +19,7 @@ makeScope newScope (self: with self; {
 
   libxfce4ui = callPackage ./libxfce4ui { };
 
-  mousepad = callPackage ./mousepad {
-    inherit (gnome3) gtksourceview;
-  };
+  mousepad = callPackage ./mousepad { };
 
   orage = callPackage ./orage { };
 
diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-13/mousepad/default.nix
index 84206f763f3..b5fd3a19d06 100644
--- a/pkgs/desktops/xfce4-13/mousepad/default.nix
+++ b/pkgs/desktops/xfce4-13/mousepad/default.nix
@@ -1,12 +1,12 @@
-{ mkXfceDerivation, exo, wrapGAppsHook, dbus_glib ? null, gtk3, gtksourceview }:
+{ mkXfceDerivation, exo, wrapGAppsHook, dbus-glib, gtk3, gtksourceview3 }:
 
 mkXfceDerivation rec {
   category = "apps";
   pname = "mousepad";
-  version = "0.4.0";
+  version = "0.4.1";
 
-  sha256 = "0mm90iq2yd3d0qbgsjyk3yj25k0gm3p34jazl640vixk84v20lyw";
+  sha256 = "0pr1w9n0qq2raxhy78982i9g17x0ya02q7vdrn0wb2bpk74hlki5";
 
   nativeBuildInputs = [ exo wrapGAppsHook ];
-  buildInputs = [ dbus_glib gtk3 gtksourceview ];
+  buildInputs = [ dbus-glib gtk3 gtksourceview3 ];
 }
-- 
GitLab


From fd1c9d4c9a66b6b5c2541fa513a96d430acf91d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 15:51:54 -0700
Subject: [PATCH 027/128] fwup: 1.2.1 -> 1.2.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fwup/versions.
---
 pkgs/tools/misc/fwup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index 77ec5bcb86b..be86f6496f0 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fwup-${version}";
-  version = "1.2.1";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "14a3bd84bnnxdrf1x80w860mhm3x4cy9jp9sf9643svq4bky4i41";
+    sha256 = "16v5s9xwdsii7pcphrb0a7aib2zprrw6n4fyc8w8c11gbkg27r4d";
   };
 
   doCheck = true;
-- 
GitLab


From a35367727ff38bb6613b6385e5c7b379ff662c66 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 15:56:04 -0700
Subject: [PATCH 028/128] chibi: 0.7.3 -> 0.8

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/chibi-scheme/versions.
---
 pkgs/development/interpreters/chibi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix
index c2ae87582df..2ad0bc0285e 100644
--- a/pkgs/development/interpreters/chibi/default.nix
+++ b/pkgs/development/interpreters/chibi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper }:
 let
-  version = "0.7.3";
+  version = "0.8";
   name = "chibi-scheme-${version}";
 in
 stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     owner = "ashinn";
     repo = "chibi-scheme";
     rev = version;
-    sha256 = "05b17flppkll1a2c2aq6lxh4iif4pjmpxmyrmiqzk0ls85gvai2x";
+    sha256 = "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 362e1702b1a29bf26b5023eaf28d206a232118dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 16:04:53 -0700
Subject: [PATCH 029/128] cups-filters: 1.20.3 -> 1.20.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cups-filters/versions.
---
 pkgs/misc/cups/filters.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index d15680b6363..12fb5619c25 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.20.3";
+  version = "1.20.4";
 
   src = fetchurl {
     url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv";
+    sha256 = "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-- 
GitLab


From 8139663f66b0c4529c0da433b103ad4ccb70aa11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 16:36:09 -0700
Subject: [PATCH 030/128] commandergenius: 2.2.0 -> 2.2.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commandergenius/versions.
---
 pkgs/games/commandergenius/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index 70413f0f941..35579059fcf 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "commandergenius-${version}";
-  version = "2.2.0";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "gerstrong";
     repo = "Commander-Genius";
     rev = "v${version}";
-    sha256 = "1hjx4j325vj1ayxi3j2dpplpd3x0iqx98gyb093ld7dfnsyilbph";
+    sha256 = "1mfw25pgr492ayqw3b85mwp20wh6anrr90gdy605nv1yjma62pmj";
   };
 
   buildInputs = [ SDL2 SDL2_image SDL2_mixer libGL boost libvorbis zlib curl python3 ];
-- 
GitLab


From d398020512f454f241fa77b8b74a6958209c1291 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 16:41:39 -0700
Subject: [PATCH 031/128] commonsCompress: 1.16.1 -> 1.17

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commons-compress/versions.
---
 pkgs/development/libraries/java/commons/compress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index eff57d6f2fd..cf9c554d57f 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.16.1";
+  version = "1.17";
   name    = "commons-compress-${version}";
 
   src = fetchurl {
     url    = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
-    sha256 = "0yz2m3qac1idg9346i64mjfrkq4kniajzx2manyybhj43v9dpx37";
+    sha256 = "1ydm6mhy0kja47mns674iyrhz5mqlhhnh2l8rglzxnq5iawpi2m0";
   };
 
   installPhase = ''
-- 
GitLab


From 6690ec57f85e9e4ee4a840f06c0e63b6ecc9e201 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Wed, 18 Jul 2018 20:05:15 -0400
Subject: [PATCH 032/128] paraview: 5.4.1 -> 5.5.2

This update should also fix the build the hydra: one part of the
change is to build paraview with Qt-5.9, as this is the configuration
that paraview upstream supports.
---
 pkgs/applications/graphics/paraview/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index e5385c75280..1d9956245a6 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper
 
 stdenv.mkDerivation rec {
   name = "paraview-${version}";
-  version = "5.4.1";
+  version = "5.5.2";
 
   # fetching from GitHub instead of taking an "official" source
   # tarball because of missing submodules there
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "Kitware";
     repo = "ParaView";
     rev = "v${version}";
-    sha256 = "1ma02sdkz2apxnwcsyvxb26ibwnjh60p71gicw6nlp042acs6v74";
+    sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j";
     fetchSubmodules = true;
   };
 
@@ -22,13 +22,14 @@ stdenv.mkDerivation rec {
     "-DPARAVIEW_ENABLE_PYTHON=ON"
     "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
     "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF"
+    "-DOpenGL_GL_PREFERENCE=GLVND"
   ];
 
   # During build, binaries are called that rely on freshly built
   # libraries.  These reside in build/lib, and are not found by
   # default.
   preBuild = ''
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 644f5d821e6..60b36ab0500 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17646,7 +17646,7 @@ with pkgs;
 
   pavucontrol = callPackage ../applications/audio/pavucontrol { };
 
-  paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
+  paraview = libsForQt59.callPackage ../applications/graphics/paraview { };
 
   packet = callPackage ../development/tools/packet { };
 
-- 
GitLab


From e48a1292a719bda03e1e29f73879bc274c9d8c8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 18 Jul 2018 17:44:52 -0700
Subject: [PATCH 033/128] bfs: 1.2.2 -> 1.2.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bfs/versions.
---
 pkgs/tools/system/bfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 3f618301a86..fd7f93d1546 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bfs-${version}";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    sha256 = "0a7zsipvndvg1kp2i35jrg9y9kncj7i6mp36dhpj8zjmkm5d5b8g";
+    sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
   };
 
   # Disable fstype test, tries to read /etc/mtab
-- 
GitLab


From 338898c2f7953ce2d17edb39ee7099365f1822c8 Mon Sep 17 00:00:00 2001
From: Boris Babic <boris.ivan.babic@gmail.com>
Date: Thu, 19 Jul 2018 12:38:15 +0200
Subject: [PATCH 034/128] postman: fix icon not found

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

diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index c51e1595ee7..3388df5e8ed 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   buildPhase = ":";   # nothing to build
 
   icon = fetchurl {
-    url = "https://www.getpostman.com/img-rebrand/logo.png";
-    sha256 = "0jdhl9c07b1723j2f172z3s5p5lh8sqa1rcvdzz3h6z5zwn21g7v";
+    url = "https://www.getpostman.com/img/v2/media-kit/Logo/PNG/pm-logo-horiz.png";
+    sha256 = "271b88317bd787f4a30ab374148e73314d60fb1b220ef791611774a061c49f30";
   };
 
   desktopItem = makeDesktopItem {
-- 
GitLab


From b9e7469c441ec8ebb5d8d06793bd47c2ea3b0faf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Jul 2018 13:27:09 +0200
Subject: [PATCH 035/128] xgboost: 0.7 -> 0.72

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

diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 7865724efa4..6ebfd1359dc 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -9,13 +9,13 @@ assert ncclSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {
   name = "xgboost-${version}";
-  version = "0.7";
+  version = "0.72";
 
   # needs submodules
   src = fetchgit {
     url = "https://github.com/dmlc/xgboost";
     rev = "refs/tags/v${version}";
-    sha256 = "1wxh020l4q037hc5z7vgxflb70l41a97anl8g6y4wxb74l5zv61l";
+    sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 88a35d8bb5e8809e19afca23076c49f23151e187 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Jul 2018 13:27:22 +0200
Subject: [PATCH 036/128] pythonPackages.xgboost: fix build

The setup.py of `python-package` contains some path resolution magic to
find `libxgboost.so` which is needed for the python API.

Unfortunately the code is incompatible with Nix as it isn't compatible
with the store-based structure for each package and tries to express the
location of the shared object with relative paths.

The detection in `setup.py` and `xgboost/libpath.py` has been either
removed entirely or patched to link to the proper store path of the
`libxgboost` build input.

See https://hydra.nixos.org/build/77702715 for further reference.
---
 .../python-modules/xgboost/default.nix        | 30 +++++-----
 .../xgboost/lib-path-for-python.patch         | 59 +++++++++++++++++++
 2 files changed, 73 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/xgboost/lib-path-for-python.patch

diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix
index 9b53c180397..d9b8fc892c1 100644
--- a/pkgs/development/python-modules/xgboost/default.nix
+++ b/pkgs/development/python-modules/xgboost/default.nix
@@ -3,30 +3,28 @@
 , nose
 , scipy
 , xgboost
+, substituteAll
 }:
 
 buildPythonPackage rec {
   pname = "xgboost";
   inherit (xgboost) version src meta;
 
-  propagatedBuildInputs = [ scipy ];
-  checkInputs = [ nose ];
-
-  postPatch = let
-    libname = "libxgboost.${stdenv.hostPlatform.extensions.sharedLibrary}";
+  patches = [
+    (substituteAll {
+      src = ./lib-path-for-python.patch;
+      libpath = "${xgboost}/lib";
+    })
+  ];
 
-  in ''
-    cd python-package
+  postPatch = "cd python-package";
 
-    sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py
-    sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py
-    cat <<EOF >xgboost/libpath.py
-    def find_lib_path():
-      return ["${xgboost}/lib/${libname}"]
-    EOF
-  '';
+  propagatedBuildInputs = [ scipy ];
+  buildInputs = [ xgboost ];
+  checkInputs = [ nose ];
 
-  postInstall = ''
-    rm -rf $out/xgboost
+  checkPhase = ''
+    ln -sf ../demo .
+    nosetests ../tests/python
   '';
 }
diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
new file mode 100644
index 00000000000..68b39dee53e
--- /dev/null
+++ b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
@@ -0,0 +1,59 @@
+diff --git a/python-package/setup.py b/python-package/setup.py
+index e6c3386f..4ed0a8bd 100644
+--- a/python-package/setup.py
++++ b/python-package/setup.py
+@@ -16,8 +16,6 @@ libpath_py = os.path.join(CURRENT_DIR, 'xgboost/libpath.py')
+ libpath = {'__file__': libpath_py}
+ exec(compile(open(libpath_py, "rb").read(), libpath_py, 'exec'), libpath, libpath)
+ 
+-LIB_PATH = [os.path.relpath(libfile, CURRENT_DIR) for libfile in libpath['find_lib_path']()]
+-print("Install libxgboost from: %s" % LIB_PATH)
+ # Please use setup_pip.py for generating and deploying pip installation
+ # detailed instruction in setup_pip.py
+ setup(name='xgboost',
+@@ -35,7 +33,6 @@ setup(name='xgboost',
+       # this will use MANIFEST.in during install where we specify additional files,
+       # this is the golden line
+       include_package_data=True,
+-      data_files=[('xgboost', LIB_PATH)],
+       license='Apache-2.0',
+       classifiers=['License :: OSI Approved :: Apache Software License'],
+       url='https://github.com/dmlc/xgboost')
+diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py
+index d87922c0..859a30fb 100644
+--- a/python-package/xgboost/libpath.py
++++ b/python-package/xgboost/libpath.py
+@@ -19,32 +19,4 @@ def find_lib_path():
+     lib_path: list(string)
+        List of all found library path to xgboost
+     """
+-    curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
+-    # make pythonpack hack: copy this directory one level upper for setup.py
+-    dll_path = [curr_path, os.path.join(curr_path, '../../lib/'),
+-                os.path.join(curr_path, './lib/'),
+-                os.path.join(sys.prefix, 'xgboost')]
+-    if sys.platform == 'win32':
+-        if platform.architecture()[0] == '64bit':
+-            dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/'))
+-            # hack for pip installation when copy all parent source directory here
+-            dll_path.append(os.path.join(curr_path, './windows/x64/Release/'))
+-        else:
+-            dll_path.append(os.path.join(curr_path, '../../windows/Release/'))
+-            # hack for pip installation when copy all parent source directory here
+-            dll_path.append(os.path.join(curr_path, './windows/Release/'))
+-        dll_path = [os.path.join(p, 'xgboost.dll') for p in dll_path]
+-    elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'):
+-        dll_path = [os.path.join(p, 'libxgboost.so') for p in dll_path]
+-    elif sys.platform == 'darwin':
+-        dll_path = [os.path.join(p, 'libxgboost.dylib') for p in dll_path]
+-
+-    lib_path = [p for p in dll_path if os.path.exists(p) and os.path.isfile(p)]
+-
+-    # From github issues, most of installation errors come from machines w/o compilers
+-    if not lib_path and not os.environ.get('XGBOOST_BUILD_DOC', False):
+-        raise XGBoostLibraryNotFound(
+-            'Cannot find XGBoost Library in the candidate path, ' +
+-            'did you install compilers and run build.sh in root path?\n'
+-            'List of candidates:\n' + ('\n'.join(dll_path)))
+-    return lib_path
++    return ["@libpath@/libxgboost.so"]
-- 
GitLab


From 1ae8fabc863f07ec9a7a5f4833ecfe14f6dc6c56 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 19 Jul 2018 21:01:29 +0900
Subject: [PATCH 037/128] oraclejdk: 10.0.1 -> 10.0.2

---
 pkgs/development/compilers/oraclejdk/jdk10-linux.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
index b93a13abc9c..e6e868fdf41 100644
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
@@ -28,7 +28,7 @@
 assert swingSupport -> xorg != null;
 
 let
-  version = "10.0.1";
+  version = "10.0.2";
 
   downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
 
@@ -51,19 +51,19 @@ let result = stdenv.mkDerivation rec {
       requireFile {
         name = "jdk-${version}_linux-x64_bin.tar.gz";
         url =  "${downloadUrlBase}/jdk10-downloads-4416644.html";
-        sha256 = "1975s6cn2lxb8jmxp236afvq6hhxqrx5jix8aqm46f5gwr2xd3mf";
+        sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6";
       }
     else if packageType == "JRE" then
       requireFile {
         name = "jre-${version}_linux-x64_bin.tar.gz";
         url = "${downloadUrlBase}/jre10-downloads-4417026.html";
-        sha256 = "11pb8cwzmalc6ax735m84g13jh1mrfc8g84b5qypnmqjjdv6fpiq";
+        sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx";
       }
     else if packageType == "ServerJRE" then
       requireFile {
         name = "serverjre-${version}_linux-x64_bin.tar.gz";
         url = "${downloadUrlBase}/sjre10-downloads-4417025.html";
-        sha256 = "0hvfqgr22sq9zyqc496vqgg5ail189h3a4pazp39i8n86brd48lw";
+        sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c";
       }
     else abort "unknown package Type ${packageType}";
 
-- 
GitLab


From cb033fabd6229b88ac2ccb84b65c1bcdb8ce651a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 19 Jul 2018 17:02:53 +0200
Subject: [PATCH 038/128] oraclejdk: 8u171 -> 8u181

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index bdd367ef352..55faf277b15 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,11 +1,11 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "171";
+  patchVersion = "181";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256.i686-linux = "0dh5r02v40pinway952fflw2r0i1xi67hmyb87c278qfp4jn929p";
-  sha256.x86_64-linux = "10jr4z0bw9wcws5xgc4qkw101cadfx5bkyvcnc4l3v5axwvjipdn";
-  sha256.armv7l-linux = "1bqivmp1wfnypgg5bsfzi25yzl7vd2xncfap9mi8jn63aj633dw0";
-  sha256.aarch64-linux = "1016lf3g1syjsl29m58s2s2w9nkj4jkvxhqg4s35vy41cs2v77j7";
+  sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
+  sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
+  sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
+  sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
-- 
GitLab


From 0204a2739c1751631b90d520ae6ea945f3b973e9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 10:42:59 -0500
Subject: [PATCH 039/128] vim-plugins: update (2018-07-19)

Moved 'dhall-vim' to match order in vim-plugin-names,
so diff'ing against generated expressions is easier.

There's a "vim-nix" update in here! :)
---
 pkgs/misc/vim-plugins/default.nix | 396 +++++++++++++++---------------
 1 file changed, 198 insertions(+), 198 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0085e9280a9..0f617d529c5 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -170,11 +170,11 @@ let
   };
 
   julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "julia-vim-2018-05-07";
+    name = "julia-vim-2018-07-01";
     src = fetchgit {
       url = "https://github.com/JuliaEditorSupport/julia-vim";
-      rev = "3b8e8f9b03c4ffa415fb715406231efbbd1dfdd6";
-      sha256 = "1dnhawb73c89x58nl0iqhn1rvyw0wrhmvfkxdsh40rnpdbjkyrcn";
+      rev = "c49d4d39fa7f54387ec20b8bbf006700b1e01fe2";
+      sha256 = "14wib4768vi7681iclihlj94dlqq1apkynma8n7p9nh3jfzd4d06";
     };
     dependencies = [];
 
@@ -192,11 +192,11 @@ let
   };
 
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nix-2018-04-24";
+    name = "vim-nix-2018-07-01";
     src = fetchgit {
       url = "https://github.com/LnL7/vim-nix";
-      rev = "dae3d30a145f1d0e50658dafd88f95cd4b5e323d";
-      sha256 = "1x3gaiz2wbqykzhk0zj0krjp81m5rxhk80pcg96f4gyqp7hxrx78";
+      rev = "7d71026ba7c2d0a4bdb915e884c4ac8dbdc45bf0";
+      sha256 = "084vs1p0qpkc4cx049v3mkyylj1n1yvd45i1sc9qafgp4x5va457";
     };
     dependencies = [];
 
@@ -412,11 +412,11 @@ let
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2018-03-23";
+    name = "tsuquyomi-2018-07-04";
     src = fetchgit {
       url = "https://github.com/Quramy/tsuquyomi";
-      rev = "94f10d312134fc59b53b2e821d3315320f694cf0";
-      sha256 = "1f084y9vv8rkb2d0ig6lc40sbdchpfc68fkxlvaky4jk1l1l89ay";
+      rev = "9247e0f1ad0e1ae7d350ad5b27ef92269955cc65";
+      sha256 = "09mihjiqg407n14gb4kr60fnyp3rpi18fr9nhnpg1ym2ly0nsa1l";
     };
     dependencies = [];
 
@@ -444,22 +444,22 @@ let
   };
 
   riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "riv-vim-2018-01-21";
+    name = "riv-vim-2018-06-21";
     src = fetchgit {
       url = "https://github.com/Rykka/riv.vim";
-      rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09";
-      sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j";
+      rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8";
+      sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2018-06-17";
+    name = "deoplete-nvim-2018-07-19";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "62078d04aea43aceb7cbdcfc4b22cf8f7767f614";
-      sha256 = "1gc6hl3yi7h2mzw2sf1phnaphwmalyfqd6lfzmzq0lzf111mq9r3";
+      rev = "0f1921799644cd662cb0a3393ba71096e5e56115";
+      sha256 = "0xbi6zac45fr8ipz1vqafl6ljh7bpdhbz7dfdyv8z04aqvn621s2";
     };
     dependencies = [];
 
@@ -488,22 +488,22 @@ let
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2018-06-01";
+    name = "vim-gitgutter-2018-07-06";
     src = fetchgit {
       url = "https://github.com/airblade/vim-gitgutter";
-      rev = "a986ab054788776dca269d6c289b470255d54e8c";
-      sha256 = "0c0rjclqz8l1w1q6dfa2sxc67ns9vvg6q7yy2l0s5p7159d423iy";
+      rev = "6076c9678643a8b2fc9973f16ec9efcd5dbe1aca";
+      sha256 = "1dyrll5rm61qdmzkym67hfyw80qnw10s1qrz9ryw3zvh1s2ad43l";
     };
     dependencies = [];
 
   };
 
   Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Spacegray-vim-2018-04-07";
+    name = "Spacegray-vim-2018-06-20";
     src = fetchgit {
       url = "https://github.com/ajh17/Spacegray.vim";
-      rev = "255a6086aa5af07e38e441964623029a39fa17c1";
-      sha256 = "0pfwmazcmsz9wdjmbw6hjcvbsd9j99jrjxw81xy1s6vqxmlhi8gj";
+      rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81";
+      sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9";
     };
     dependencies = [];
 
@@ -608,17 +608,6 @@ let
 
   };
 
-  dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "dhall-vim-2018-06-04";
-    src = fetchgit {
-      url = "https://github.com/vmchale/dhall-vim";
-      rev = "290c2ec86b5c3d35dd3913cbb6ab9d2139074e38";
-      sha256 = "03jhcaz6r2lbd4drc8acc9kv2k0287nzvw7lyl36jjkk3qy4c499";
-    };
-    dependencies = [];
-
-  };
-
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "clighter8-2018-04-15";
     src = fetchgit {
@@ -634,11 +623,11 @@ let
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2018-06-02";
+    name = "neomake-2018-07-16";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "ed2d2069ef7d2e919fc73c993a2c99a05d12d79e";
-      sha256 = "1sf1ad8qzya8vkj8kdkkd204hs0fn7wh3ar9wv4nq1ks7v2y2855";
+      rev = "f26a31a315f60150fd42682df911306b4d795dd8";
+      sha256 = "1rxlzypzwlr6j84llg30d122142la621nai1f7735i58kvmzk51w";
     };
     dependencies = [];
 
@@ -678,22 +667,22 @@ let
   };
 
   denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-extra-2018-06-02";
+    name = "denite-extra-2018-07-19";
     src = fetchgit {
       url = "https://github.com/chemzqm/denite-extra";
-      rev = "54c2df37a2fa53e3caed4ad7391f85ff6dc7f0b1";
-      sha256 = "0rsgd302h3rml98a9ddkaglp157av6yhbfbmc5i781k5pz003vvg";
+      rev = "10836562703ebfe6552204e63b9b4293236d6d0f";
+      sha256 = "1jq6wv6vhjpkd9xy8i6rjd0l69djvxg8395ylclr2dv21carx5z6";
     };
     dependencies = [];
 
   };
 
   denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-git-2018-06-05";
+    name = "denite-git-2018-07-19";
     src = fetchgit {
       url = "https://github.com/chemzqm/denite-git";
-      rev = "dfc8c8977133b2e00efa2d5add7ff05c36b2c1a3";
-      sha256 = "1p4y22wwxvhxbgavandlld2rp2204g7vr162y0vsc0dm9lygvvm6";
+      rev = "edd2c202e05c3f84e31b94a841fef236b923d559";
+      sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd";
     };
     dependencies = [];
 
@@ -722,22 +711,22 @@ let
   };
 
   CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "CheckAttach-2017-03-15";
+    name = "CheckAttach-2018-07-18";
     src = fetchgit {
       url = "https://github.com/chrisbra/CheckAttach";
-      rev = "b583efd45e03902438a55299623390a0f9253513";
-      sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34";
+      rev = "0f1f2e78071d7f805a0a679955cb4486f692b753";
+      sha256 = "11skk275ijq8hwpp0zxsdgr08brq08v1syvyawck8vzrnqrq71sc";
     };
     dependencies = [];
 
   };
 
   csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "csv-vim-2018-06-12";
+    name = "csv-vim-2018-06-24";
     src = fetchgit {
       url = "https://github.com/chrisbra/csv.vim";
-      rev = "eddfe4d553d2d25ffcf294e225717ddf9ae4c357";
-      sha256 = "1074x0gycwaivadsa6g7mfhdf9rvyirhsfipby2pcvjrkbzvmz7j";
+      rev = "918be3bd15920fd9bc79fca5e6870b8055742a1a";
+      sha256 = "01fhw55s5q23ny3n7ldg53n3raysr2wnnkpfybbba2wv55w5vpdy";
     };
     dependencies = [];
 
@@ -755,22 +744,22 @@ let
   };
 
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sort-motion-2018-03-05";
+    name = "vim-sort-motion-2018-07-15";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-sort-motion";
-      rev = "b4455cea401c86d189e84c4dda55f18d8a4a67d4";
-      sha256 = "0cav0l152qy8fvhwpcdr7lddf0jnjkjw6hnjrmmpvikxj7rq2yik";
+      rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5";
+      sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb";
     };
     dependencies = [];
 
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2018-05-17";
+    name = "vim-tmux-navigator-2018-07-13";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-tmux-navigator";
-      rev = "d030f75e2932605cfc1417ca2ebb3fd5192c2a8e";
-      sha256 = "1qfkzlg7g4ri54fhxnwwvh2xsm0hcnfxav7chdw10z3g984nzb1a";
+      rev = "18b775fbccde5ff02e516c014290650bb40e257d";
+      sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj";
     };
     dependencies = [];
 
@@ -788,11 +777,11 @@ let
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2018-06-11";
+    name = "ctrlp-vim-2018-06-28";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "306bc60a1bed48cee895623d03c87d84d00764b6";
-      sha256 = "1ylzg9wjc1m4jgi6p3wk9nbip16cfhhgcbavly394j9w4zn3zdwy";
+      rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989";
+      sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk";
     };
     dependencies = [];
 
@@ -876,11 +865,11 @@ let
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2018-05-31";
+    name = "vim-2018-07-07";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "23e76f31abae2d3e090fcc25fbfcd8d8c9edd3bd";
-      sha256 = "0zj749kc65dgqhsan65wagqlq45hg68m7qs07h1r12csfrr3r8x7";
+      rev = "a88e82a94f0ff41e84e51fe501635f0f64d1bb33";
+      sha256 = "1ld7vbh6dxrf3wqbya9pvvzwp7qgv2pdj74g5w7yjn1bdi597vnm";
     };
     dependencies = [];
 
@@ -964,11 +953,11 @@ let
   };
 
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2018-06-16";
+    name = "elm-vim-2018-06-18";
     src = fetchgit {
       url = "https://github.com/elmcast/elm-vim";
-      rev = "e7c2f9ce36e69608c2f289f75e22d068255eac1f";
-      sha256 = "022xan3ss4rrfhdsz9dd5n6avk4nf6lxqqbgpx9v4lrnqy01dhd8";
+      rev = "e51e2e43ad617c26205a84453481d3ac152c8fec";
+      sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b";
     };
     dependencies = [];
 
@@ -1041,11 +1030,11 @@ let
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2018-06-16";
+    name = "vim-go-2018-07-18";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "155836d47052ea9c9bac81ba3e937f6f22c8e384";
-      sha256 = "1d16xninxwmqd6vgcjxzlqqynygb2h40lfmvwgp2cm60g2994fa3";
+      rev = "2c909e71e184de6ea23e3f8adc7d199856c2806b";
+      sha256 = "0v42yrgnd3hi8s2i9ij7ldgyvs75jkikw1kpqblysdim9cfbbqfk";
     };
     dependencies = [];
 
@@ -1206,11 +1195,11 @@ let
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2018-06-11";
+    name = "vim-snippets-2018-07-19";
     src = fetchgit {
       url = "https://github.com/honza/vim-snippets";
-      rev = "62f46770378ab899f40c334de264ccd64dc2db57";
-      sha256 = "1g55qhy81dh9x5rkzij3k7ain561gz1amyvg69cq44n6d7pz798h";
+      rev = "1143432afdb3a97b606b081700eead5b4f499d4d";
+      sha256 = "1z0pgpsv8y1zhxlm6w76wgd4wx378wbq44mvgxxfxi0mfvb6vywf";
     };
     dependencies = [];
 
@@ -1250,22 +1239,22 @@ let
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2018-03-12";
+    name = "calendar-vim-2018-07-04";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim";
-      rev = "1aee272cc37670b4f96c5d75975ae8af3bd8809e";
-      sha256 = "1mr7yb07aycpc9famb0kq71sb4xyw87zgnkn0gk9i96pcjaab5fs";
+      rev = "f27fcf52c8a516f55ede5cff468f0a3e4014ae1b";
+      sha256 = "07gg83bgj9c43jn66zlvyc1avqjyidb9cjwdv1ln3965zkl47b5r";
     };
     dependencies = [];
 
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2018-05-19";
+    name = "lightline-vim-2018-07-05";
     src = fetchgit {
       url = "https://github.com/itchyny/lightline.vim";
-      rev = "555f202e33987863aaa31bf4df75ef989c3c49a7";
-      sha256 = "0997k1wzlclwf4y70mv5zncv6vp9xdwgp5q7nickw6j9qf86gb84";
+      rev = "0532dff598abca9975d3f80128eaadadbf1d91d4";
+      sha256 = "1wvhl2wc2p4vqi7zzj7wdyq0cnbfq8s7g5ifcchj8f5s8c4h4lfc";
     };
     dependencies = [];
 
@@ -1316,11 +1305,11 @@ let
   };
 
   vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-test-git-2018-05-30";
+    name = "vim-test-git-2018-07-10";
     src = fetchgit {
       url = "https://github.com/janko-m/vim-test.git";
-      rev = "062c489781c995f7e81103fec8a3c07bd2ff1f4b";
-      sha256 = "0q4rnaqf5c979h10pacxxn7h3zv4zs9lf7f3z90avnlarh1sjvvx";
+      rev = "e24477e81e91fe90c5d914849848027cb09a7c86";
+      sha256 = "1kkfzs0bmbg4kjips1jylrsd5rqd39ab2x2z1a64pjkx1fvl703b";
     };
     dependencies = [];
 
@@ -1437,11 +1426,11 @@ let
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2018-05-28";
+    name = "fzf-vim-2018-07-11";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "ce82e10630830bc37a50f706cc3b7216d24e5009";
-      sha256 = "081r1a4zqcr46rb4d39m8yj2dq1kiadh7n2iv7gxaqqldhx0p8pb";
+      rev = "8d56bdd6ade7899f0b0a10cfc219804b4ccbc109";
+      sha256 = "0m3p2gp42hshxb7hrgw63fp155a5l1x9fjr2k21dv22xqlaqy9hj";
     };
     dependencies = [];
 
@@ -1580,11 +1569,11 @@ let
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2018-04-04";
+    name = "vim-signature-2018-07-06";
     src = fetchgit {
       url = "https://github.com/kshenoy/vim-signature";
-      rev = "968622e98238dd7cbd32fc5f4faa60c6b5aed6d8";
-      sha256 = "0cwkb28zszf4sd5i0mcg6bjamjxxkxsr1plx79pwai5ckcgc2x72";
+      rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc";
+      sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm";
     };
     dependencies = [];
 
@@ -1635,11 +1624,11 @@ let
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2018-06-17";
+    name = "vimtex-2018-07-13";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "13474370fa0cc5e547abd6f40a9b6fddf2712ae4";
-      sha256 = "1rwj8i5k8xaa466ld1p5nxsvfk3g20g42l2xqa60s6jmjicn7km5";
+      rev = "e3dabe0a369dac556508ac5d1132979d654bc753";
+      sha256 = "10wkfh106xc89bk72n0xc2xa7iva74p4pj0n9wfd3dbspagrf9j2";
     };
     dependencies = [];
 
@@ -1679,11 +1668,11 @@ let
   };
 
   rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rainbow-2018-06-14";
+    name = "rainbow-2018-06-19";
     src = fetchgit {
       url = "https://github.com/luochen1990/rainbow";
-      rev = "e7d115792f2a6bf6248d3f84a9025ae5e759868e";
-      sha256 = "0zd7dcbrn7djx3nqnf8kkz8wzxcjla2b3bzqg2j7v9bjb3x3vdfl";
+      rev = "549724c2123c5a06834676963be0d76d5c37abc1";
+      sha256 = "0hh0w337qw5yk9flk4iz4vfpa4q13blvyv10hgbfrqy72s30gpdf";
     };
     dependencies = [];
 
@@ -1771,11 +1760,11 @@ let
   };
 
   undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2017-10-26";
+    name = "undotree-2018-07-02";
     src = fetchgit {
       url = "https://github.com/mbbill/undotree";
-      rev = "cdbb9022b8972d3e156b8d60af33bf795625b058";
-      sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253";
+      rev = "a80159c9f5c238575b63984b8bc610bc5de6b233";
+      sha256 = "10l091qbigcj053l65bs3cdnysasl7f2qdbsk8bk6k0xj7rrpgzl";
     };
     dependencies = [];
 
@@ -1826,22 +1815,22 @@ let
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2018-05-03";
+    name = "vim-signify-2018-07-08";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-signify";
-      rev = "a1551dbae3b76035360b2ea2b38555194505d925";
-      sha256 = "0wcfdcvbpl6hknsmzmpj86kbw1mfbfc55fza6kwad0lsw9ff5cix";
+      rev = "9303070b022c4a642a8d35361e3680622c525144";
+      sha256 = "0was67gn22dn361jg1qc4iscdkm0cg65dprfyd7r6ifhi6v01jmz";
     };
     dependencies = [];
 
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2018-06-14";
+    name = "vim-startify-2018-07-03";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "0b300f411f466f14f6832b3c97b7fb109f7b1ee3";
-      sha256 = "0qjd2bnag4rr29yjkrxrzpkvfkb0912g2virj5rr26bbf8ya6s5q";
+      rev = "7bbc46e1c2eb9e2e6e4e5a34a634b40d85eb1bde";
+      sha256 = "1q5gxyd85xfhl4i8gzw23dq36bg14lld5i91vnz8xys25idzjs1s";
     };
     dependencies = [];
 
@@ -1939,11 +1928,11 @@ let
   };
 
   vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easygit-2018-05-15";
+    name = "vim-easygit-2018-07-08";
     src = fetchgit {
       url = "https://github.com/neoclide/vim-easygit";
-      rev = "ada670f87f269e431b72cd7d63727683c46f3b4b";
-      sha256 = "0shj52jzkhq89kw9wg4p89f1aidn9c0h6ishq56pdzzmqnjgzkdr";
+      rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a";
+      sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8";
     };
     dependencies = [];
 
@@ -2028,11 +2017,11 @@ let
   };
 
   vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-javascript-2018-06-12";
+    name = "vim-javascript-2018-07-14";
     src = fetchgit {
       url = "https://github.com/pangloss/vim-javascript";
-      rev = "935125e2c481a65d344b11ddfdb2e5f903e24e72";
-      sha256 = "1n4cij2in9i4f6mcj7wn9zn9i4xmxcrf6yn00bacx4f51l6qhhkr";
+      rev = "39e332a3c36c0115e1eab85c34cf121b7585869d";
+      sha256 = "04ycwh298i213zw0zvj99igfmxf36swycryapsgp9jrh9jjd9hmw";
     };
     dependencies = [];
 
@@ -2072,11 +2061,11 @@ let
   };
 
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "purescript-vim-2018-03-31";
+    name = "purescript-vim-2018-07-05";
     src = fetchgit {
       url = "https://github.com/raichoo/purescript-vim";
-      rev = "8528d2a4a84f428aefad5882212c34db5c852699";
-      sha256 = "0dkh1cm9z644x5cj9dxwdkyb0r9sji71jv35cyy7z0aj9b8x2jbf";
+      rev = "ab8547cef5827f046d43ba57203acb6692b7ef06";
+      sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33";
     };
     dependencies = [];
 
@@ -2105,22 +2094,22 @@ let
   };
 
   committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "committia-vim-git-2018-04-11";
+    name = "committia-vim-git-2018-07-14";
     src = fetchgit {
       url = "https://github.com/rhysd/committia.vim.git";
-      rev = "02a317cb49689b2424232d607d218511f921f2e4";
-      sha256 = "1bfdkj0jbhkklnzd894aigx1cply8bbpzkskvzmbsj7h7jm9iyz5";
+      rev = "6aa77b9161e75828d0be2ba40ed420cbf7a55279";
+      sha256 = "0sr7wzccj805fnc48qgcshp8rypz3vb8507pkc1r3pn7wbxqkni1";
     };
     dependencies = [];
 
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2018-05-19";
+    name = "vim-grammarous-2018-06-22";
     src = fetchgit {
       url = "https://github.com/rhysd/vim-grammarous";
-      rev = "058db30bbd88e23fceb2f6364d9b22803d7c4c0d";
-      sha256 = "1l2vhfsb0lhr5j77r8lgqnqgs9h9kdhw9bla1lj27xi0njbl4kql";
+      rev = "0d8a0272389a32bd49e74bb00527c02f9aca19a8";
+      sha256 = "0ji18hjhp1gx147z682b4xy1w02kqcr8rb5frccyqn4kdpqhqvbk";
     };
     dependencies = [];
     # use `:GrammarousCheck` to initialize checking
@@ -2180,44 +2169,44 @@ let
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2018-01-15";
+    name = "rust-vim-2018-07-17";
     src = fetchgit {
       url = "https://github.com/rust-lang/rust.vim";
-      rev = "8e75da9834abb22f8d7ece3f4ca4324a14fa18a6";
-      sha256 = "1mn4jijfzz2jq215dnwkq5gxiw0ysmvrsrvq4aypr2ms2040iqiq";
+      rev = "2fa74427456a68e9e90f542567f851df50d48a8c";
+      sha256 = "0vqvw5czwy3v99dv5gbgy8ljg31qhsnhqjfl0a4dfij6p66xyi46";
     };
     dependencies = [];
 
   };
 
   vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-devicons-2018-05-19";
+    name = "vim-devicons-2018-06-21";
     src = fetchgit {
       url = "https://github.com/ryanoasis/vim-devicons";
-      rev = "8ee4c8cdef4f6ea0f27b341ac077c303d0e57a90";
-      sha256 = "1mfkg9miqg42qmzamlkhjc3mlqcri69d1pj6cs4kz3bdl7326ww6";
+      rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26";
+      sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2018-06-01";
+    name = "neoformat-2018-07-16";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "ebe9ed941aea254e5fc6c3e2a0219054ff873e4b";
-      sha256 = "0la3nvyi8kmp8pq6pkbhjc35wg6g28f903y7bz4igsajl37nijm1";
+      rev = "f20e73193f2260d4437d160759d6b623a74a5a35";
+      sha256 = "0460v5h82zsgslqxkiwf2qbkah15hf3p33ddvcipfqg0rnrbwynp";
     };
     dependencies = [];
 
   };
 
   nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nerdcommenter-2018-03-03";
+    name = "nerdcommenter-2018-06-21";
     src = fetchgit {
       url = "https://github.com/scrooloose/nerdcommenter";
-      rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1";
-      sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4";
+      rev = "9a32fd2534427f7a1dcfe22e9c0ea6b67b6dbe78";
+      sha256 = "0s862kzhvv9qpr7gxd3h52hczjvm55zyff5qn0z5095072pr3wjx";
     };
     dependencies = [];
 
@@ -2235,11 +2224,11 @@ let
   };
 
   syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "syntastic-2018-06-15";
+    name = "syntastic-2018-07-16";
     src = fetchgit {
       url = "https://github.com/scrooloose/syntastic";
-      rev = "9e1b2a8620a0ff48a9f4e42a6e09b65a34ad2a6a";
-      sha256 = "1765ish9vdm7abm7c45z4h4v1xdhfis7igm5yc3m5h7im33gl7j2";
+      rev = "0dde090ed41b383b1fa56f8db49d89e0735b1ca9";
+      sha256 = "027g3wmfdrhb65krlfs89xk3imbm2mgzb2ddv7xwrhch736nvb2q";
     };
     dependencies = [];
 
@@ -2257,11 +2246,11 @@ let
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2018-06-05";
+    name = "vim-polyglot-2018-07-08";
     src = fetchgit {
       url = "https://github.com/sheerun/vim-polyglot";
-      rev = "33f610feb73ce782cf41a7d9a377541991c692b5";
-      sha256 = "0sqsarrvy8flxlp0nj5782gzqvk3v6c7r6234pbpjwqga967h0fd";
+      rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751";
+      sha256 = "1q1aw0sapr2zgrxbh97g6hj22f2xym3apzfxw5xxmqzmjc0kiq4p";
     };
     dependencies = [];
 
@@ -2279,11 +2268,11 @@ let
   };
 
   denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-nvim-2018-06-11";
+    name = "denite-nvim-2018-07-19";
     src = fetchgit {
       url = "https://github.com/shougo/denite.nvim";
-      rev = "ef3ffe7ffff25b0260be1e336dcd55014a6787a7";
-      sha256 = "1zvin44fb9b11dciv1i14pwr3wc6yigsr4xmcg3gzaibr4mpng6b";
+      rev = "0cab5543d755be4a6c9d331672b07235f8473f1f";
+      sha256 = "1r9a29fjmab7r10f5c39xdmbpq14jc6lwyj7d63b5p2dnlva2wr0";
     };
     dependencies = [];
 
@@ -2367,11 +2356,11 @@ let
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2018-06-17";
+    name = "neosnippet-vim-2018-07-19";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "978ef36165e83ba1f8ee0a2047b6c923f7842d33";
-      sha256 = "083jfdwadjdv2pwbxmwz8m384m023zvzdszjnn6qkbgwimx5ga7m";
+      rev = "2959ae99f6e8f422e7d9062fd0a3cd692d2221fb";
+      sha256 = "0zdyfc9lrp8g76b6qigci6dlxz0zqpqf5y9887x2zdy631dksfi4";
     };
     dependencies = [];
 
@@ -2441,11 +2430,11 @@ let
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2018-04-23";
+    name = "alchemist-vim-2018-06-25";
     src = fetchgit {
       url = "https://github.com/slashmili/alchemist.vim";
-      rev = "d15033ce1b94aa1e6ba11c1bf1249d9680b24a45";
-      sha256 = "0b0r236ah56zax7s095wq18j6bvfp267a3nfrndnszihwh7h2v1j";
+      rev = "5575fc8e18695b050b1c4d51623ae37f12ff7648";
+      sha256 = "0s1x0avshxfrqj9vd8bahkw10sn9hmajwch285zib9aynqp5x2ma";
     };
     dependencies = [];
 
@@ -2485,11 +2474,11 @@ let
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2018-04-17";
+    name = "vim-multiple-cursors-2018-07-16";
     src = fetchgit {
       url = "https://github.com/terryma/vim-multiple-cursors";
-      rev = "b781b1461bd4b346958309e1733a9d6ad1a66b6c";
-      sha256 = "0hadbp2yj0kzcwj5rp18diq3b24xgxn46n7c29dgrjg91w4vagfd";
+      rev = "b9e17a51bb2d857f6a5099363232c4fc7715115d";
+      sha256 = "0dd9m0a33r4diwykk5nxya199zimn0n4gmp2mi8fnwk6m1f8fwnw";
     };
     dependencies = [];
 
@@ -2529,11 +2518,11 @@ let
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2018-05-07";
+    name = "vim-quickrun-2018-06-19";
     src = fetchgit {
       url = "https://github.com/thinca/vim-quickrun";
-      rev = "4b493faaeb5322f11cadab52e39a53164baf9db7";
-      sha256 = "0081m3v8dg4ihxsd0rzhmrra3i6vrnpz0svgjmm689rk55dkrv5i";
+      rev = "825f9f195521646f7001f10cad8627c48017311f";
+      sha256 = "0ckcwij5y71dxrga34jxgvf41hs44p4mrd31hbmkz1qrq1i7glpa";
     };
     dependencies = [];
 
@@ -2595,44 +2584,44 @@ let
   };
 
   vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-commentary-2018-05-30";
+    name = "vim-commentary-2018-07-11";
     src = fetchgit {
       url = "https://github.com/tpope/vim-commentary";
-      rev = "7f2127b1dfc57811112785985b46ff2289d72334";
-      sha256 = "0ck221cj0zwn19p0vlzv0vl26rjlsnfpllslrqjh5g57m5cxb8aq";
+      rev = "8295187ea1210138c0b171d8e3ec3569936f4c1a";
+      sha256 = "1zgbpgl0n11b4jlgx7h7rr1jbgdib7yf8vmh62cxrdj5hrngb6h6";
     };
     dependencies = [];
 
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2018-06-02";
+    name = "vim-dispatch-2018-07-18";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "47729b7831421f20fa40a7d5b3e9b928faf18e75";
-      sha256 = "0wmvfqzw785c9bda0p4vlsavm0d59dmmnhs87jvqfijzyi2prj1l";
+      rev = "43760f9d8469d59fd629a97e19dce4491192cca6";
+      sha256 = "16kziq3y4v0nksilrblryf2vham87w9c3y133xm6zznyjsjp2x90";
     };
     dependencies = [];
 
   };
 
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2018-05-28";
+    name = "vim-eunuch-2018-07-13";
     src = fetchgit {
       url = "https://github.com/tpope/vim-eunuch";
-      rev = "e57666aa8d3a87b42c5ec429490bbf4a54f4c31d";
-      sha256 = "01sz7mhckhnwlp48rkl34cz4nkjwrkdc1rq4mbknd3yscg1w259d";
+      rev = "e5f4f955d53e07192fb330ff272604c1b8290532";
+      sha256 = "0cv3j3bkapb45ywlfiz8csxmz7gnsdngwgmkrgfg6sljnsgav2za";
     };
     dependencies = [];
 
   };
 
   vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-fugitive-2018-06-15";
+    name = "vim-fugitive-2018-07-18";
     src = fetchgit {
       url = "https://github.com/tpope/vim-fugitive";
-      rev = "d39d5ca4299569a5d1a37a511d1a5eccef71b037";
-      sha256 = "1657x01ihw96hnbnflyzxc88qpyj2lm6dnl84xs1ckzw3iqsw6ki";
+      rev = "9b9a81b170040ab0061ebd5beec1f5e2e1177056";
+      sha256 = "189w34rjh67j1hs77284xaxq8xlhc0zrk4nnk3qnprwg5qfr4plz";
     };
     dependencies = [];
 
@@ -2650,33 +2639,33 @@ let
   };
 
   vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-repeat-2018-01-30";
+    name = "vim-repeat-2018-07-02";
     src = fetchgit {
       url = "https://github.com/tpope/vim-repeat";
-      rev = "8106e142dfdc278ff3eaaadd7b362ad7949d4357";
-      sha256 = "1q0bmqxi1kqxq7g8l0qj7y93g9rqffwc3fbmhpj3chx2kswhd5hc";
+      rev = "43d2678fa59d068c815d8298331c195e850ff5a7";
+      sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0";
     };
     dependencies = [];
 
   };
 
   vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-rhubarb-2017-06-28";
+    name = "vim-rhubarb-2018-07-19";
     src = fetchgit {
       url = "https://github.com/tpope/vim-rhubarb";
-      rev = "6caad2b61afcc1b7c476b0ae3dea9ee5f2b1d14a";
-      sha256 = "1bmc5j9056bgdhyhvylbd93jkp1k9067mv3af6skzh0r77rx1a0g";
+      rev = "186bf27e05ab8713193b1d1210cd3c79f392445a";
+      sha256 = "127gv59dkw1z7lpspxk7by2pf1mqqb6jxc58g359m76lfqpkcvvv";
     };
     dependencies = [];
 
   };
 
   vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sensible-2018-01-22";
+    name = "vim-sensible-2018-07-16";
     src = fetchgit {
       url = "https://github.com/tpope/vim-sensible";
-      rev = "2d60332fa5b2b1ea346864245569df426052865a";
-      sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb";
+      rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525";
+      sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q";
     };
     dependencies = [];
 
@@ -2716,11 +2705,11 @@ let
   };
 
   vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-vinegar-2018-06-06";
+    name = "vim-vinegar-2018-06-20";
     src = fetchgit {
       url = "https://github.com/tpope/vim-vinegar";
-      rev = "bc2d57e2f57551171370b4458c6198041b11750c";
-      sha256 = "0f0pasz9r9qqdnlcc6zj94kh4dnslydb7zfdjhdj2salqm3hnpd7";
+      rev = "7b9dff85aec34a0be1a6980b2e686a5d27d70f63";
+      sha256 = "033w3wsg5ijwmkq5l1d5r7l0mqfy784sbh8mbjcsx13ndl8fc2g8";
     };
     dependencies = [];
 
@@ -2782,11 +2771,11 @@ let
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2018-06-10";
+    name = "youcompleteme-2018-06-20";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "e49f817bfe7a7400efcc0b6527188ff6395f996f";
-      sha256 = "19cnixx08aqirb9yw2k3glklmyna075x1d9szzpg8ml557v9qgnn";
+      rev = "e1ead995c13fe20989ee3d69fd76b20c5fff5d5b";
+      sha256 = "01my9m7a5m24zrh6i867fhqz42jxs0ai2pl4pra8wzvyk4ai1p5f";
     };
     dependencies = [];
     buildPhase = ''
@@ -2808,11 +2797,11 @@ let
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2018-06-13";
+    name = "vim-airline-2018-07-13";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline";
-      rev = "45c9621157b5bc851804bfed57b8a504d55757b0";
-      sha256 = "0g4g5fa0qy6hagic590sksa8z6xlmigdan64bya06jr9m7fd8a1a";
+      rev = "4cc255a3849c15484f7da5b5039d73f1a567a7e2";
+      sha256 = "124pl87zwfg4fnb3il5jy5dz03bq5vzyk10z60dvkfw4cr57hlfw";
     };
     dependencies = [];
 
@@ -2863,11 +2852,11 @@ let
   };
 
   vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ruby-2018-06-02";
+    name = "vim-ruby-2018-07-08";
     src = fetchgit {
       url = "https://github.com/vim-ruby/vim-ruby";
-      rev = "1e4c6fdf4450a01208911c079538e1a2ed128ec6";
-      sha256 = "0xnnk0sd3z8v5hvdxy7rljvzfvdl63dqvd3kiksw4kzj7j8gcbkg";
+      rev = "3e0f241b544c63d44ac925ec557ce6735b24d9cf";
+      sha256 = "16ywzvb78pxinls0za1bzcds9aznsgvds8q2l4wimp4q9wrs1scs";
     };
     dependencies = [];
 
@@ -3050,11 +3039,11 @@ let
   };
 
   vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimoutliner-2018-04-09";
+    name = "vimoutliner-2018-07-04";
     src = fetchgit {
       url = "https://github.com/vimoutliner/vimoutliner";
-      rev = "4f12628247940d98eedd594961695dc504261058";
-      sha256 = "1z44zf9wvd6mc1zb6ywrkjw87yrj1blmc5s03xk9zv5q8hskjl78";
+      rev = "aad0a213069b8a1b5de91cca07d153fc8352c957";
+      sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2";
     };
     dependencies = [];
 
@@ -3071,23 +3060,34 @@ let
 
   };
 
+  dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "dhall-vim-2018-07-15";
+    src = fetchgit {
+      url = "https://github.com/vmchale/dhall-vim";
+      rev = "a17c1ebb1487f2a69dd5230e9d4b8a247b50e2ae";
+      sha256 = "1xrlzvi626bhxh8rs0gz4hjkx7qc0f6bb0vl6ainnkjqafb310qw";
+    };
+    dependencies = [];
+
+  };
+
   ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ale-2018-06-17";
+    name = "ale-2018-07-17";
     src = fetchgit {
       url = "https://github.com/w0rp/ale";
-      rev = "24fe1953110455f7f3305db2a8e5abc2aa6821af";
-      sha256 = "0m47h33w73k6p0p4i8rhqpnp8jn5siyjzwyhgv5nk3ydci5y1mmy";
+      rev = "5453e0e1a43302226da1d1d753e162af0231f9d3";
+      sha256 = "0zcgfjssvfcc30ksgp42khc9s91gxymkz3dzdhnvwkm0vx90mjlp";
     };
     dependencies = [];
 
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2018-05-25";
+    name = "vim-wakatime-2018-07-14";
     src = fetchgit {
       url = "https://github.com/wakatime/vim-wakatime";
-      rev = "3d88d49551c15f6abd9fecd2480ef75f0d8cbe40";
-      sha256 = "1lm4j5c67q4al1ymqnr0zlbdgql0381rl65v78vyai8vzaj98m14";
+      rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf";
+      sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -3175,14 +3175,14 @@ let
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2018-05-20";
+    name = "deoplete-go-2018-07-03";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-go";
-      rev = "977fb75b38b82528d179f1029d1852900332dedc";
-      sha256 = "114ypdawgj5k2gx1ff48z7yzk14b7gc68s4ijnb1yww2qxa2g9wm";
+      rev = "2d402d856d98d4a351fdcf40d837da0cf52ccdfd";
+      sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq";
     };
     dependencies = [];
-    buildInputs = [ python3 ];
+    buildInputs = [ python3 ]; 
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -3192,22 +3192,22 @@ let
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2018-05-13";
+    name = "deoplete-jedi-2018-07-10";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "45f1ac2cf44e6a0c10298e07b4d308b84e94a80d";
-      sha256 = "03590rabdycbwjp0h36crb0jsavw5mln77hl107mb737rq2dgmah";
+      rev = "5540e76ee3194f2eaa2df51945297cb847a1dfa8";
+      sha256 = "0mqq42v4l2y0hkcs83j0cp7hxamv6gn5g8z4bccrbssgrsv61cg6";
     };
     dependencies = [];
 
   };
 
   zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2018-06-10";
+    name = "zig-vim-2018-07-18";
     src = fetchgit {
       url = "https://github.com/zig-lang/zig.vim";
-      rev = "e35f63823edcf1dd35fa3deb262e6eed0cac4f8c";
-      sha256 = "0vr6hh4vnpi6gbr3d54xip2n6s4j5xaiiqvzpa4pl6vfnqixazq5";
+      rev = "2dc38afd6af04ea563a0d0d6f61891b5c820e8fe";
+      sha256 = "1nyrg87biwq6b3jk40fyjd5mlnl4pbvwsqi9095y8gjanf9a9dck";
     };
     dependencies = [];
 
-- 
GitLab


From a79a0c686b00526fe918667cb24bf15f8a8abd91 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 10:52:50 -0500
Subject: [PATCH 040/128] vim-plugins: swift, fastfold, some colorschemes

---
 pkgs/misc/vim-plugins/default.nix      | 66 ++++++++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  6 +++
 2 files changed, 72 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0f617d529c5..014dc498c94 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -743,6 +743,17 @@ let
 
   };
 
+  base16-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "base16-vim-2018-05-24";
+    src = fetchgit {
+      url = "https://github.com/chriskempson/base16-vim";
+      rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d";
+      sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk";
+    };
+    dependencies = [];
+
+  };
+
   vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-sort-motion-2018-07-15";
     src = fetchgit {
@@ -1304,6 +1315,17 @@ let
 
   };
 
+  tender-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tender-vim-2017-03-14";
+    src = fetchgit {
+      url = "https://github.com/jacoborus/tender.vim";
+      rev = "6b0497a59233b3e67fb528a498069eb1d24743f9";
+      sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn";
+    };
+    dependencies = [];
+
+  };
+
   vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-test-git-2018-07-10";
     src = fetchgit {
@@ -1557,6 +1579,17 @@ let
 
   };
 
+  swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "swift-vim-2018-04-20";
+    src = fetchgit {
+      url = "https://github.com/keith/swift.vim";
+      rev = "404df978f9830d9cf0a1f5002cb02f594e3e8996";
+      sha256 = "03xhzljzcfm0678d6i8j5493pi5knav1hx0jldgn3hish892pfr3";
+    };
+    dependencies = [];
+
+  };
+
   rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rainbow_parentheses-vim-2013-03-04";
     src = fetchgit {
@@ -1568,6 +1601,17 @@ let
 
   };
 
+  fastfold = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "fastfold-2018-06-02";
+    src = fetchgit {
+      url = "https://github.com/konfekt/fastfold";
+      rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30";
+      sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r";
+    };
+    dependencies = [];
+
+  };
+
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-signature-2018-07-06";
     src = fetchgit {
@@ -2060,6 +2104,17 @@ let
 
   };
 
+  awesome-vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "awesome-vim-colorschemes-2018-01-20";
+    src = fetchgit {
+      url = "https://github.com/rafi/awesome-vim-colorschemes";
+      rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d";
+      sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z";
+    };
+    dependencies = [];
+
+  };
+
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "purescript-vim-2018-07-05";
     src = fetchgit {
@@ -2429,6 +2484,17 @@ let
 
   };
 
+  last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "last256-2017-06-11";
+    src = fetchgit {
+      url = "https://github.com/sk1418/last256";
+      rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0";
+      sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv";
+    };
+    dependencies = [];
+
+  };
+
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "alchemist-vim-2018-06-25";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0137c2e6b47..188d87f9484 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -23,6 +23,7 @@
 "github:chrisbra/CheckAttach"
 "github:chrisbra/csv.vim"
 "github:chrisgeo/sparkup"
+"github:chriskempson/base16-vim"
 "github:christoomey/vim-sort-motion"
 "github:christoomey/vim-tmux-navigator"
 "github:ctjhoa/spacevim"
@@ -75,6 +76,7 @@
 "github:itchyny/vim-cursorword"
 "github:itchyny/vim-gitbranch"
 "github:ivanov/vim-ipython"
+"github:jacoborus/tender.vim"
 "github:janko-m/vim-test.git"
 "github:JazzCore/ctrlp-cmatcher"
 "github:jceb/vim-hier"
@@ -101,7 +103,9 @@
 "github:kana/vim-operator-user"
 "github:kana/vim-tabpagecd"
 "github:kchmck/vim-coffee-script"
+"github:keith/swift.vim"
 "github:kien/rainbow_parentheses.vim"
+"github:konfekt/fastfold"
 "github:kshenoy/vim-signature"
 "github:lambdalisue/vim-gista"
 "github:latex-box-team/latex-box"
@@ -166,6 +170,7 @@
 "github:python-mode/python-mode"
 "github:Quramy/tsuquyomi"
 "github:racer-rust/vim-racer"
+"github:rafi/awesome-vim-colorschemes"
 "github:raichoo/purescript-vim"
 "github:reedes/vim-pencil"
 "github:reedes/vim-wordy"
@@ -203,6 +208,7 @@
 "github:shougo/vimproc.vim"
 "github:SirVer/ultisnips"
 "github:sjl/gundo.vim"
+"github:sk1418/last256"
 "github:slashmili/alchemist.vim"
 "github:t9md/vim-smalls"
 "github:takac/vim-hardtime"
-- 
GitLab


From 0073c30dbf260df65089da565c25601d74b3cadd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 11:08:44 -0500
Subject: [PATCH 041/128] vim-plugins: document sorting, fix vim command to not
 ask to hit enter

Fixes #38748. Hopefully :).
---
 pkgs/misc/vim-plugins/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 014dc498c94..c944f22fac2 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -19,8 +19,9 @@ let
 
 
 # TL;DR
-# Add your plugin to ./vim-plugin-names
-# Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +'w result' +qall"`
+# * Add your plugin to ./vim-plugin-names
+#   * sort -df ./vim-plugin-names > sorted && mv sorted vim-plugin-names
+# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'w result' +qall"`
 # Note: pluginnames2nix will fetch any plugins in the file; to speed up the process,
 #       update ./vim-plugin-names to contain only plugins which need generation
 # Copy the generated expression(s) into this file from the ./result file.
-- 
GitLab


From ee68c9e0849744e7cc979851349ffdd7318a70f9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 11:16:05 -0500
Subject: [PATCH 042/128] vim-plugins: simplify command slightly, overwrite
 'result' if present

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c944f22fac2..557547060b8 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -21,7 +21,7 @@ let
 # TL;DR
 # * Add your plugin to ./vim-plugin-names
 #   * sort -df ./vim-plugin-names > sorted && mv sorted vim-plugin-names
-# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'w result' +qall"`
+# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'x! result'"`
 # Note: pluginnames2nix will fetch any plugins in the file; to speed up the process,
 #       update ./vim-plugin-names to contain only plugins which need generation
 # Copy the generated expression(s) into this file from the ./result file.
-- 
GitLab


From 7e9be731384a9ac1cb0b863d67e9977161b25f51 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Jul 2018 10:48:12 -0500
Subject: [PATCH 043/128] vim-plugins: add alias for maktaba so it is found as
 a dependency

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 557547060b8..8428a3b7894 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -3330,6 +3330,7 @@ let
   Hoogle              = vim-hoogle;
   ipython             = vim-ipython;
   latex-live-preview  = vim-latex-live-preview;
+  maktaba             = vim-maktaba;
   mayansmoke          = mayansmoke-git;
   multiple-cursors    = vim-multiple-cursors;
   necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
-- 
GitLab


From b244d92f33bb081aaff59a1151671458b23200e4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 19 Jul 2018 09:21:30 -0700
Subject: [PATCH 044/128] mattermost: 5.0.0 -> 5.1.0

---
 pkgs/servers/mattermost/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 305ee174bf3..0654da92776 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
 
 let
-  version = "5.0.0";
+  version = "5.1.0";
 
   mattermost-server = buildGoPackage rec {
     name = "mattermost-server-${version}";
@@ -10,7 +10,7 @@ let
       owner = "mattermost";
       repo = "mattermost-server";
       rev = "v${version}";
-      sha256 = "12wiw8k5is78ppazrf26y2xq73kwbafa9w75wjnb1839v2k9sark";
+      sha256 = "069ihmfr6np991mbgg001y0kyafghn57nsv3kpyyvfmhv07p0qbc";
     };
 
     goPackagePath = "github.com/mattermost/mattermost-server";
@@ -27,7 +27,7 @@ let
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-      sha256 = "1pal65di6w9idf3rwxh77la1v816h8kama1ilkbs40cpp2vazw3b";
+      sha256 = "1bm5nqnhk2w3sy8mvm81k7d65j6bgpvakgphgwqgnlm864i4253z";
     };
 
     installPhase = ''
-- 
GitLab


From ecd9be1b624ae911645e4bd5619467b1e552d6b0 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 19 Jul 2018 09:20:34 -0700
Subject: [PATCH 045/128] perlPackages.TextBibTeX: Update perl version in an
 output path

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 27a1341eecc..15372f23dd3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16108,7 +16108,7 @@ let self = _self // overrides; _self = with self; {
       install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex"
       install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse"
       install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames"
-      install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.3/darwin-2level/auto/Text/BibTeX/BibTeX.bundle"
+      install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.4/darwin-2level/auto/Text/BibTeX/BibTeX.bundle"
     '';
     meta = {
       description = "Interface to read and parse BibTeX files";
-- 
GitLab


From 59159f9d8eb3810ef11aee081730bc81c24575b2 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 19 Jul 2018 20:18:44 +0200
Subject: [PATCH 046/128] haskellPackages.hnix: Fix build (#43824)

---
 .../haskell-modules/configuration-common.nix         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c7e7cd4f4c3..1d83126f41b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -244,19 +244,21 @@ self: super: {
   # base bound
   digit = doJailbreak super.digit;
 
-  # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
-  hnix = (overrideCabal super.hnix (old: {
+  # dontCheck: Can be removed once https://github.com/haskell-nix/hnix/commit/471712f is in (5.2 probably)
+  #   This is due to GenList having been removed from generic-random in 1.2.0.0
+  # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably)
+  #   This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though
+  hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: {
     patches = old.patches or [] ++ [
       # should land in hnix-5.2
       (pkgs.fetchpatch {
         url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch";
         sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh";
         name = "disable-hpack-test-by-default.patch";
-       })
+      })
     ];
     testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
-    broken = true;   # can't cope with deriving-compat 0.5.x.
-  }));
+  })));
 
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;
-- 
GitLab


From c4cca95bf2405a64237ca46042426a05481cac99 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:38:15 +0200
Subject: [PATCH 047/128] yafaray-core: adhere to version convention

see issue #43717
---
 pkgs/tools/graphics/yafaray-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix
index a0de144d907..7321128a6b5 100644
--- a/pkgs/tools/graphics/yafaray-core/default.nix
+++ b/pkgs/tools/graphics/yafaray-core/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
 
     name = "yafaray-core-${version}";
-    version = "v3.3.0";
+    version = "3.3.0";
 
     src = fetchFromGitHub {
       owner  = "YafaRay";
       repo   = "Core";
-      rev    = "${version}";
+      rev    = "v${version}";
       sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6";
     };
 
-- 
GitLab


From aa10b3127f49d43c926c18f8417b100dd8ac222f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:43:11 +0200
Subject: [PATCH 048/128] weechat: set name to include version

see issue #43717
---
 pkgs/applications/networking/irc/weechat/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index dec933489af..a672fa73c4f 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -123,6 +123,7 @@ in if configure == null then weechat else
     ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
     exec ${weechat}/bin/weechat "$@"
   '') // {
+    name = weechat.name;
     unwrapped = weechat;
     meta = weechat.meta;
   }
-- 
GitLab


From bdcba71f9e7a2187e67738754ce7ca1a5b222533 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:49:33 +0200
Subject: [PATCH 049/128] taffybar: include version in name

---
 pkgs/applications/window-managers/taffybar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix
index 3181914c40f..b1e0628ba92 100644
--- a/pkgs/applications/window-managers/taffybar/default.nix
+++ b/pkgs/applications/window-managers/taffybar/default.nix
@@ -3,7 +3,7 @@
 let
 taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
 in stdenv.mkDerivation {
-  name = "taffybar-with-packages";
+  name = "taffybar-with-packages-${taffybarEnv.version}";
 
   nativeBuildInputs = [ makeWrapper ];
 
-- 
GitLab


From 5324d84423530bd58317f2af62357a2021b70dc8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:51:35 +0200
Subject: [PATCH 050/128] xmonad: include version in name

---
 pkgs/applications/window-managers/xmonad/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix
index 6f3d463adb2..bc7a5174e26 100644
--- a/pkgs/applications/window-managers/xmonad/wrapper.nix
+++ b/pkgs/applications/window-managers/xmonad/wrapper.nix
@@ -3,7 +3,7 @@
 let
 xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self);
 in stdenv.mkDerivation {
-  name = "xmonad-with-packages";
+  name = "xmonad-with-packages-${xmonadEnv.version}";
 
   nativeBuildInputs = [ makeWrapper ];
 
-- 
GitLab


From c01411f10909844e57272a729baa5c7d6c7b59df Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:55:04 +0200
Subject: [PATCH 051/128] leksah: include version in name

see issue #43717
---
 pkgs/development/tools/haskell/leksah/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix
index fb91015e10c..f1c754ddff9 100644
--- a/pkgs/development/tools/haskell/leksah/default.nix
+++ b/pkgs/development/tools/haskell/leksah/default.nix
@@ -3,7 +3,7 @@
 let
 leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]);
 in stdenv.mkDerivation {
-  name = "leksah";
+  name = "leksah-${leksahEnv.version}";
 
   buildInputs = [ gtk3 ];
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From aba0e560f07bdba19df0b097db6a0b479c8088c0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 19 Jul 2018 21:56:29 +0200
Subject: [PATCH 052/128] ical2org: adhere to version number convention

see issue #43717
---
 pkgs/tools/misc/ical2org/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix
index decc4afde0b..141fc968a2d 100644
--- a/pkgs/tools/misc/ical2org/default.nix
+++ b/pkgs/tools/misc/ical2org/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "ical2org-${version}";
-  version="v.1.1.5";
+  version="1.1.5";
 
   goPackagePath = "github.com/rjhorniii/ical2org";
 
   src = fetchFromGitHub {
     owner = "rjhorniii";
     repo = "ical2org";
-    rev = "${version}";
+    rev = "v.${version}";
     sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm";
     fetchSubmodules = true;
   };
-- 
GitLab


From b68770c1a2b44e94b48c1c167f30318c1dedc138 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 19 Jul 2018 22:12:15 +0200
Subject: [PATCH 053/128] signal-desktop: 1.14.2 -> 1.14.3

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

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index d0b7ccfbff7..a8574680186 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,11 +40,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0szc7ynl26hqvvwk3sx02ym4abyz78akx0sp6cvif3bb4m8brz1c";
+    sha256 = "1z8z32d7ic28zg4mgk3cjmzb6kpism7xzym2ng25b0ndf72g1vfi";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From accfb935037a1095548533dd9586a810470d37e4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 19 Jul 2018 22:27:40 +0200
Subject: [PATCH 054/128] lf: Install the manual page

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

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 7f44dab71f4..6ec9729438c 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -28,6 +28,10 @@ buildGoPackage rec {
     runHook postBuild
   '';
 
+  postInstall = ''
+    install -D --mode=444 lf.1 $out/share/man/man1/lf.1
+  '';
+
   meta = with stdenv.lib; {
     description = "A terminal file manager written in Go and heavily inspired by ranger";
     longDescription = ''
-- 
GitLab


From 6c1e45b00025d112bbcfaf22939c33650a6e8c55 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 19 Jul 2018 22:31:17 +0200
Subject: [PATCH 055/128] nvme-cli: 1.5 -> 1.6

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

diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix
index 044479c5629..b40b6125bd9 100644
--- a/pkgs/os-specific/linux/nvme-cli/default.nix
+++ b/pkgs/os-specific/linux/nvme-cli/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "nvme-cli-${version}";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "linux-nvme";
     repo = "nvme-cli";
     rev = "v${version}";
-    sha256 = "1nl5hl5am8djwmrw1xxnd9ahp7kyzyj0yh1nxgmx43pn3d61n0vz";
+    sha256 = "0pp00yzj9c398bzd7jrjhzr7q1pk7d069dnbzyq1qqssszgcj599";
   };
 
   makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
-- 
GitLab


From 48a1dafdbeb184b78ea775c1938014b40e9dd5cf Mon Sep 17 00:00:00 2001
From: Elias Probst <mail@eliasprobst.eu>
Date: Thu, 19 Jul 2018 23:58:25 +0200
Subject: [PATCH 056/128] terraform: remove whitespace from name

A `nix-env -iA unstable.terraform-full` gave me
`installing 'terraform-with-plugins -0.11.7'`
This removes the whitespace which sneaked into its name.
---
 pkgs/applications/networking/cluster/terraform/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 4f45de76d16..fbcb6c8be40 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -60,7 +60,7 @@ let
           # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
           if actualPlugins == []
             then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; })
-            else lib.appendToName "with-plugins "(stdenv.mkDerivation {
+            else lib.appendToName "with-plugins"(stdenv.mkDerivation {
               inherit (terraform) name;
               buildInputs = [ makeWrapper ];
 
-- 
GitLab


From 037e06f0b382f74531adb1a13e9a1fa677c8f18c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 19 Jul 2018 20:50:51 -0400
Subject: [PATCH 057/128] linux: 4.4.141 -> 4.4.142

---
 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 b1a2c0982f7..dc7c6357406 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.141";
+  version = "4.4.142";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "08nbz4xg43v57h0x5zw69vnjkvddl9ppi0vwzwf6yxd3ism4p3ci";
+    sha256 = "0zyxlqjnxrr1a1wlg3hzk8sx77ysmy66wb34kp77iv04xr9p9kai";
   };
 } // (args.argsOverride or {}))
-- 
GitLab


From df8062c45b1247cb5e58c453a0d7d02fab941f7c Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 19 Jul 2018 18:12:04 -0700
Subject: [PATCH 058/128] treewide: http -> https

---
 pkgs/applications/networking/super-productivity/default.nix | 2 +-
 pkgs/development/libraries/libav/default.nix                | 2 +-
 pkgs/development/libraries/libdbusmenu-qt/default.nix       | 4 ++--
 pkgs/development/libraries/vulkan-headers/default.nix       | 2 +-
 pkgs/development/tools/vulkan-validation-layers/default.nix | 2 +-
 pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix    | 2 +-
 pkgs/servers/livepeer/default.nix                           | 2 +-
 pkgs/tools/networking/dhcpdump/default.nix                  | 2 +-
 pkgs/top-level/perl-packages.nix                            | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
index 7c613a8a45a..251bef91360 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -97,7 +97,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "To Do List / Time Tracker with Jira Integration.";
-    homepage = http://super-productivity.com;
+    homepage = https://super-productivity.com;
     license = licenses.mit;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ offline ];
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index b726d9c2b42..dfe1455759a 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -21,7 +21,7 @@ assert faacSupport -> enableUnfree;
 let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in
 
 /* ToDo:
-    - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools
+    - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools
     - maybe do some more splitting into outputs
 */
 
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 34ba39d799e..1342ee6773f 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -3,7 +3,7 @@
 let
   baseName = "libdbusmenu-qt";
   v = "0.9.2";
-  homepage = "http://launchpad.net/${baseName}";
+  homepage = "https://launchpad.net/${baseName}";
   name = "${baseName}-${v}";
 in
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = "-DWITH_DOC=OFF";
-  
+
   meta = with stdenv.lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";
     inherit homepage;
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 797c64729ec..e154403697f 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Vulkan Header files and API registry";
-    homepage    = "http://www.lunarg.com";
+    homepage    = https://www.lunarg.com;
     platforms   = platforms.linux;
     license     = licenses.asl20;
     maintainers = [ maintainers.ralith ];
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 8951f16e43c..c5f6a13b813 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "LunarG Vulkan loader";
-    homepage    = "http://www.lunarg.com";
+    homepage    = https://www.lunarg.com;
     platforms   = platforms.linux;
     license     = licenses.asl20;
     maintainers = [ maintainers.ralith ];
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 7137390ecab..50b9146871d 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://packages.ubuntu.com/source/zesty/kmod;
+    homepage = https://packages.ubuntu.com/source/zesty/kmod;
     description = "Linux kernel module blacklists from Ubuntu";
     platforms = platforms.linux;
   };
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 105223f31a5..2e17001abc5 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -27,7 +27,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Official Go implementation of the Livepeer protocol";
-    homepage = http://livepeer.org;
+    homepage = https://livepeer.org;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ elitak ];
diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix
index 91232b4ffa7..af4b03ab700 100644
--- a/pkgs/tools/networking/dhcpdump/default.nix
+++ b/pkgs/tools/networking/dhcpdump/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses";
-    homepage = http://packages.ubuntu.com/ru/lucid/dhcpdump;
+    homepage = https://packages.ubuntu.com/ru/lucid/dhcpdump;
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c910c2852f0..f5ddcaec054 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5105,7 +5105,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ];
     meta = with stdenv.lib; {
-      homepage = http://www.matijs.net/software/msgconv/;
+      homepage = https://www.matijs.net/software/msgconv/;
       description = "A .MSG to mbox converter";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
       maintainers = with maintainers; [ peterhoeg ];
-- 
GitLab


From 1d284727d3baf91a306a32d487b1ad607b978dc0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 19 Jul 2018 18:45:38 -0700
Subject: [PATCH 059/128] mercurial: fix homepage

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

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index a00393abf27..cd632336952 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -56,8 +56,8 @@ in python2Packages.buildPythonApplication {
   meta = {
     inherit version;
     description = "A fast, lightweight SCM system for very large distributed projects";
-    homepage = http://mercurial.selenic.com/;
-    downloadPage = "http://mercurial.selenic.com/release/";
+    homepage = https://www.mercurial-scm.org;
+    downloadPage = https://www.mercurial-scm.org/release/;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.eelco ];
     updateWalker = true;
-- 
GitLab


From e97448f7e05f3eebfdff6e356f901efbcf38d34a Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Tue, 3 Jul 2018 14:40:09 +0900
Subject: [PATCH 060/128] qiskit: 0.5.4 -> 0.5.7

---
 .../python-modules/qiskit/default.nix         | 10 +++------
 .../python-modules/qiskit/setup.py.patch      | 21 -------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/python-modules/qiskit/setup.py.patch

diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 1eda590a864..4ca0155627c 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -21,13 +21,13 @@
 
 buildPythonPackage rec {
   pname = "qiskit";
-  version = "0.5.4";
+  version = "0.5.7";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a86014da4ea8fe057ad3b953b44e2342f2bae3e1f9ac0d5f5d51dd659c33accf";
+    sha256 = "a5a2c6c074f8479dc83d1d599dfebf2363402a182835b8fa5742804055148b17";
   };
 
   buildInputs = [ cmake ]
@@ -50,13 +50,9 @@ buildPythonPackage rec {
   # Pypi's tarball doesn't contain tests
   doCheck = false;
 
-  patches = [
-    ./setup.py.patch
-  ];
-
   meta = {
     description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications";
-    homepage    = https://github.com/QISKit/qiskit-sdk-py;
+    homepage    = https://github.com/QISKit/qiskit-terra;
     license     = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [
       pandaman
diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch
deleted file mode 100644
index 9c4224ce64c..00000000000
--- a/pkgs/development/python-modules/qiskit/setup.py.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -18,13 +18,13 @@ from setuptools.dist import Distribution
- 
- requirements = [
-     "IBMQuantumExperience>=1.9.2",
--    "matplotlib>=2.1,<2.2",
--    "networkx>=2.0,<2.1",
--    "numpy>=1.13,<1.15",
--    "ply==3.10",
--    "scipy>=0.19,<1.2",
--    "sympy>=1.0,<1.2",
--    "pillow>=4.2.1,<5.2"
-+    "matplotlib>=2.1",
-+    "networkx>=2.0",
-+    "numpy>=1.13",
-+    "ply>=3.10",
-+    "scipy>=0.19",
-+    "sympy>=1.0",
-+    "pillow>=4.2.1"
- ]
-- 
GitLab


From c7fec43ee83681573c8fdc4bf7c5dceffd9379ff Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Wed, 4 Jul 2018 15:15:51 +0900
Subject: [PATCH 061/128] qasm2image: 0.5.0 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
index 174e0871ca2..5f7cded86fd 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "qasm2image";
-  version = "0.5.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "nelimeee";
     repo = "qasm2image";
-    rev = "7f3c3e4d1701b8b284ef0352aa3a47722ebbbcaa";
-    sha256 = "129xlpwp36h2czzw1wcl8df2864zg3if2gaad1v18ah1cf68b0f3";
+    rev = "57a640621bbbc74244f07e2e068a26411b0d9b24";
+    sha256 = "1ha5vfl4jfwcwbipsq07xlknkrvx79z5bwbzndybclyk9pa69dlz";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 9146271578a7ca0f7cabcb4ec04af6e98e7132b5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 20 Jul 2018 07:18:04 +0200
Subject: [PATCH 062/128] python.pkgs.scikitimage: move expression

---
 .../python-modules/scikit-image/default.nix   | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +-----------
 2 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/scikit-image/default.nix

diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
new file mode 100644
index 00000000000..da7918ebe2d
--- /dev/null
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, cython
+, dask
+, nose
+, numpy
+, scipy
+, six
+, pillow
+, matplotlib
+, networkx
+}:
+
+buildPythonPackage rec {
+  pname = "scikit-image";
+  version = "0.12.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
+  };
+
+  buildInputs = [ cython dask nose ];
+
+  propagatedBuildInputs = [ pillow matplotlib networkx scipy six numpy ];
+
+  # the test fails because the loader cannot create test objects!
+  doCheck = false;
+
+  meta = {
+    description = "Image processing routines for SciPy";
+    homepage = http://scikit-image.org;
+    license = lib.licenses.bsd3;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5697feb540..14fe614841f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12437,28 +12437,7 @@ in {
 
   scipy = callPackage ../development/python-modules/scipy { };
 
-  scikitimage = buildPythonPackage rec {
-    name = "scikit-image-${version}";
-    version = "0.12.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/scikit-image/${name}.tar.gz";
-      sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
-    };
-
-    buildInputs = with self; [ cython dask nose numpy scipy six ];
-
-    propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy six numpy ];
-
-    # the test fails because the loader cannot create test objects!
-    doCheck = false;
-
-    meta = {
-      description = "Image processing routines for SciPy";
-      homepage = http://scikit-image.org;
-      license = licenses.bsd3;
-    };
-  };
+  scikitimage = callPackage ../development/python-modules/scikit-image { };
 
   scikitlearn = callPackage ../development/python-modules/scikitlearn {
     inherit (pkgs) gfortran glibcLocales;
-- 
GitLab


From 9768a80726c1a008e2fce25557381277666b3688 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 20 Jul 2018 07:38:08 +0200
Subject: [PATCH 063/128] python.pkgs.pywavelets: init at 0.5.2

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

diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix
new file mode 100644
index 00000000000..c072b661cc4
--- /dev/null
+++ b/pkgs/development/python-modules/pywavelets/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cython
+, nose
+, pytest
+, numpy
+}:
+
+buildPythonPackage rec {
+  pname = "PyWavelets";
+  version = "0.5.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ce36e2f0648ea1781490b09515363f1f64446b0eac524603e5db5e180113bed9";
+  };
+
+  checkInputs = [ nose pytest ];
+
+  buildInputs = [ cython ];
+
+  propagatedBuildInputs = [ numpy ];
+
+  # Somehow nosetests doesn't run the tests, so let's use pytest instead
+  checkPhase = ''
+    py.test pywt/tests
+  '';
+
+  meta = {
+    description = "Wavelet transform module";
+    homepage = https://github.com/PyWavelets/pywt;
+    license = lib.licenses.mit;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 14fe614841f..5d1525f54f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4568,6 +4568,8 @@ in {
 
   };
 
+  pywavelets = callPackage ../development/python-modules/pywavelets { };
+
   zope_deprecation = buildPythonPackage rec {
     name = "zope.deprecation-4.1.2";
 
-- 
GitLab


From 6ed3ea6e74d31ef8fe8f5983df0c4676a5a791ea Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 20 Jul 2018 07:42:28 +0200
Subject: [PATCH 064/128] python.pkgs.scikitimage: 0.12.3 -> 0.14.0

---
 .../python-modules/scikit-image/default.nix   | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index da7918ebe2d..6ac3ab5ddb9 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -2,30 +2,35 @@
 , fetchPypi
 , buildPythonPackage
 , cython
-, dask
-, nose
 , numpy
 , scipy
-, six
-, pillow
 , matplotlib
 , networkx
+, six
+, pillow
+, pywavelets
+, dask
+, cloudpickle
+, nose
+, pytest
 }:
 
 buildPythonPackage rec {
   pname = "scikit-image";
-  version = "0.12.3";
+  version = "0.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
+    sha256 = "325f75eb80fbc5371136e37f323445309ca9f65b6c6f718d0d0e2189e5de1224";
   };
 
-  buildInputs = [ cython dask nose ];
+  buildInputs = [ cython ];
+
+  propagatedBuildInputs = [ numpy scipy matplotlib networkx six pillow pywavelets dask cloudpickle ];
 
-  propagatedBuildInputs = [ pillow matplotlib networkx scipy six numpy ];
+  checkInputs = [ pytest ];
 
-  # the test fails because the loader cannot create test objects!
+  # No tests in archive
   doCheck = false;
 
   meta = {
-- 
GitLab


From 5fba38d65c895b3de627711533b68efcb1b83133 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Wed, 18 Jul 2018 18:02:54 +1000
Subject: [PATCH 065/128] pythonPackages.image-match: init at 1.1.2

---
 .../python-modules/image-match/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/image-match/default.nix

diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix
new file mode 100644
index 00000000000..25c3c901a4e
--- /dev/null
+++ b/pkgs/development/python-modules/image-match/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, dask, scikitimage, six }:
+
+buildPythonPackage {
+  pname = "image-match";
+  version = "1.1.2";
+
+  src = fetchFromGitHub {
+    owner = "ascribe";
+    repo = "image-match";
+    rev = "1c5f3170555540bdf43ff8b8189c4e8c13a8b950";
+    sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5";
+  };
+
+  buildInputs = [ pytestrunner ];
+
+  propagatedBuildInputs = [
+    scikitimage
+  ];
+
+  # remove elasticsearch requirement due to version incompatibility
+  postPatch = ''
+    substituteInPlace setup.py --replace "'elasticsearch>=5.0.0,<6.0.0'," ""
+  '';
+
+  # tests cannot work without elasticsearch
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ascribe/image-match;
+    description = "Quickly search over billions of images";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ cmcdragonkai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d1525f54f2..81d38de4f38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3131,6 +3131,8 @@ in {
 
   };
 
+  image-match = callPackage ../development/python-modules/image-match { };
+
   imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { };
 
   immutables = callPackage ../development/python-modules/immutables {};
-- 
GitLab


From aecf24a0eb00bd61f192781b45dad0c0c0099a8d Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 20 Jul 2018 10:30:49 +0200
Subject: [PATCH 066/128] openvpn: document how to import an external config

---
 nixos/modules/services/networking/openvpn.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index a418839d22b..b94b4026fd9 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -131,6 +131,9 @@ in
               Configuration of this OpenVPN instance.  See
               <citerefentry><refentrytitle>openvpn</refentrytitle><manvolnum>8</manvolnum></citerefentry>
               for details.
+
+              To import an external config file, use the following definition:
+              <literal>config = "config /path/to/config.ovpn"</literal>
             '';
           };
 
-- 
GitLab


From a5ade790b41a4bad5fa9e732b470fbaf4b17bc59 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Fri, 20 Jul 2018 14:04:53 +0200
Subject: [PATCH 067/128] gencfsm: fix build

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

diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index 3a9c81df234..9398b38cb34 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs
-, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg
+, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobjectIntrospection
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ autoconf automake intltool libtool vala glib encfs
     gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
-    wrapGAppsHook ];
+    wrapGAppsHook gobjectIntrospection  ];
 
   patches = [ ./makefile-mkdir.patch ];
 
@@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.spacefrogg ];
-    broken = true; # 2018-04-10
   };
 }
-- 
GitLab


From a4d5583a858ecf96262ab34eedef706a898ac4f6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Jul 2018 08:13:10 -0400
Subject: [PATCH 068/128] gradle: 4.8.1 -> 4.9

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index f810f97ef49..f5ca69e59c8 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
-    name = "gradle-4.8.1";
+    name = "gradle-4.9";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "0wgdf1iv0izi957hay1xfsk5xnl6s2vx5dammcwy8say9fclscxg";
+      sha256 = "0a0dkdzmz0ynf73inii8djy2hihqd9c97fir9c0d4g8px3f6jvp6";
     };
   };
 
-- 
GitLab


From b77a32f6cffecda1fe829a29cff4c1226f185ae8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Jul 2018 08:18:01 -0400
Subject: [PATCH 069/128] minikube: 0.28.0 -> 0.28.1

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

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 7301e45a41f..4c2e1b6f4c0 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,7 +14,7 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.28.0";
+  version = "0.28.1";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -22,7 +22,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "1gm61w0f33mdax6im42wckfmjgdr5pziiaw2n7yj6jfjrxjnmzmf";
+    sha256 = "0c36rzsdzxf9q6l4hl506bsd4qwmw033i0k1xhqszv9agg7qjlmm";
   };
 
   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
-- 
GitLab


From 871f3396a56c862b5f122a94c12a5946ee48b735 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 20 Jul 2018 08:22:03 -0400
Subject: [PATCH 070/128] vscode: 1.25.0 -> 1.25.1

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index d79a50855f3..cf58d5d2190 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.25.0";
+  version = "1.25.1";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "1dgn9swqax54pn5ykk97zdkkzyj46jambmnkb67cn44p29bw9s9m";
-    "x86_64-linux" = "0w2lzif7iilibvwhvg13gxarwz41qsb72s8hvj87mk5iqfdms1px";
-    "x86_64-darwin" = "08xhwvggflzh9lfc5s3jgrqb49yz4jdfii8sfq6v8w3c6yy8cdly";
+    "i686-linux" = "1qljnajk4h9ki5gvydh1b557fvhvcryvkrvypvz0pr804lpdqsmg";
+    "x86_64-linux" = "0f1lpwyxfchmbymzzxv97w9cy1z5pdljhwm49mc5v84aygmvnmjq";
+    "x86_64-darwin" = "1dgda1drij1c114xzv4hs44k7rx4x1vzghlxgii0h2rg641n6pbn";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
-- 
GitLab


From 69454943b78cbf7bb126fe3f2d2b2e6dfeef565b Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Fri, 20 Jul 2018 15:24:40 +0200
Subject: [PATCH 071/128] vulnix: 1.6.3 -> 1.7

The updated version brings selective whitelisting, i.e. when some CVEs
of a package are whitelisted and others are not, only the new CVEs are
reported.

Also correct license to match upstream BSD-3-Clause and clean up source.
---
 pkgs/tools/security/vulnix/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 70640563aa3..6e099e5d786 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -2,16 +2,21 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "vulnix";
-  version = "1.6.3";
+  version = "1.7";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0ia71l0210dgcxf63bg07csx40nmpdghr4mszz91qrri7lsa5qqi";
+    sha256 = "16228w0vakb515cnrk4akadh0m21abiv8rv574jarcsf7359xslj";
   };
 
   buildInputs = [ ronn ];
 
-  checkInputs = with pythonPackages; [ freezegun pytest pytestcov pytest-flake8 ];
+  checkInputs = with pythonPackages; [
+    freezegun
+    pytest
+    pytestcov
+    pytest-flake8
+  ];
 
   propagatedBuildInputs = [
     nix
@@ -27,9 +32,7 @@ pythonPackages.buildPythonApplication rec {
 
   outputs = [ "out" "doc" ];
 
-  postBuild = ''
-    make -C doc
-  '';
+  postBuild = "make -C doc";
 
   checkPhase = "py.test src/vulnix";
 
@@ -45,7 +48,7 @@ pythonPackages.buildPythonApplication rec {
   meta = with stdenv.lib; {
     description = "NixOS vulnerability scanner";
     homepage = https://github.com/flyingcircusio/vulnix;
-    license = licenses.bsd2;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ ckauhaus plumps ];
   };
 }
-- 
GitLab


From 491f20533236798e45d9e40ee41c6577f818942d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 20 Jul 2018 15:37:49 +0200
Subject: [PATCH 072/128] knot-dns: libidn -> libidn2

It's only used by the `kdig` tool.
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index ef99772a082..2bdd758b980 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn
+{ stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
 , systemd, nettle, libedit, zlib, libiconv, libintl
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls liburcu libidn
+    gnutls liburcu libidn2 libunistring
     nettle libedit
     libiconv lmdb libintl
     # without sphinx &al. for developer documentation
-- 
GitLab


From 0e617f68d3b752024cd6d8064a5ccc18e85e799f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 20 Jul 2018 15:16:33 +0100
Subject: [PATCH 073/128] gdbgui: 0.11.1.2 -> 0.13.0.0

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

diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index 12d3f97dfc4..29bf92d2b6e 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -4,14 +4,14 @@ let
 in
 python27Packages.buildPythonApplication rec {
   pname = "gdbgui";
-  version = "0.11.1.2";
+  version = "0.13.0.0";
 
   buildInputs = [ gdb ];
   propagatedBuildInputs = builtins.attrValues deps.packages;
 
   src = python27Packages.fetchPypi {
     inherit pname version;
-    sha256 = "15502fg90df183mcg6nic8fakf111pgrlp7f044g3136wpwgfln7";
+    sha256 = "16a46kabhfqsgsks5l25kpgrvrkdah3h5f5m6ams2z9nzbrxl8bz";
   };
 
   postPatch = ''
-- 
GitLab


From b97a98e5242ae9dfa6564fe3abebdfb21b9e1cf8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 20 Jul 2018 10:15:55 -0500
Subject: [PATCH 074/128] python3Packages.zconfig: remove test that relies on
 setlocale failing

---
 .../python-modules/zconfig/default.nix        |  3 ++-
 .../zconfig/remove-setlocale-test.patch       | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/zconfig/remove-setlocale-test.patch

diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix
index f8f933b96ab..79f6ddca543 100644
--- a/pkgs/development/python-modules/zconfig/default.nix
+++ b/pkgs/development/python-modules/zconfig/default.nix
@@ -15,7 +15,8 @@ buildPythonPackage rec {
     sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19";
   };
 
-  patches = [ ./skip-broken-test.patch ];
+  patches = [ ./skip-broken-test.patch ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch;
 
   buildInputs = [ manuel docutils ];
   propagatedBuildInputs = [ zope_testrunner ];
diff --git a/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch
new file mode 100644
index 00000000000..6b3d3266b21
--- /dev/null
+++ b/pkgs/development/python-modules/zconfig/remove-setlocale-test.patch
@@ -0,0 +1,24 @@
+From 43fd87037be1c98b6afa20f179f2e2d8ef5491ba Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Fri, 20 Jul 2018 10:07:22 -0500
+Subject: [PATCH] remove test that fails w/musl (setlocale() always succeeds)
+
+---
+ ZConfig/tests/test_datatypes.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ZConfig/tests/test_datatypes.py b/ZConfig/tests/test_datatypes.py
+index 7c8d80c..addecd2 100644
+--- a/ZConfig/tests/test_datatypes.py
++++ b/ZConfig/tests/test_datatypes.py
+@@ -229,7 +229,6 @@ class DatatypeTestCase(unittest.TestCase):
+         convert = self.types.get("locale")
+         # Python supports "C" even when the _locale module is not available
+         self.assertEqual(convert("C"), "C")
+-        self.assertRaises(ValueError, convert, "locale-does-not-exist")
+ 
+     def test_datatype_port(self):
+         convert = self.types.get("port-number")
+-- 
+2.18.0
+
-- 
GitLab


From b5b23b39bebb8f4efe9d2448a10ab9bbfef62683 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:43:03 +0200
Subject: [PATCH 075/128] libsass: Fix CVE-2018-11693

See https://github.com/sass/libsass/pull/2676

For https://github.com/NixOS/nixpkgs/issues/43846
---
 pkgs/development/libraries/libsass/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 8168ff0edae..38ba93d4f7c 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
@@ -9,7 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz";
   };
 
-  patchPhase = ''
+  patches = [
+    # CVE-2018-11693, is in master but no release yet
+    (fetchpatch {
+      url = "https://github.com/sass/libsass/commit/af0e12cdf09d43dbd1fc11e3f64b244277cc1a1e.patch";
+      sha256 = "1y8yvjvvz91lcr1kpq2pw8729xhdgp15mbldcw392pfzdlliwdyl";
+    })
+  ];
+
+  preConfigure = ''
     export LIBSASS_VERSION=${version}
   '';
 
-- 
GitLab


From 73aaf63fb1632b6ba1f8c57d2e125b9c960d3544 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:15:43 +0200
Subject: [PATCH 076/128] postgresql93: 9.3.22 -> 9.3.23

Release notes: https://www.postgresql.org/docs/10/static/release-9-3-23.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 5d348c12943..caf921d4a7a 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -95,9 +95,9 @@ let
 in {
 
   postgresql93 = common {
-    version = "9.3.22";
+    version = "9.3.23";
     psqlSchema = "9.3";
-    sha256 = "06p9rk2bav41ybp8ra1bpf44avw9kl5s1wyql21n5awvlm5fs60v";
+    sha256 = "1jzncs7b6zrcgpnqjbjcc4y8303a96zqi3h31d3ix1g3vh31160x";
   };
 
   postgresql94 = common {
-- 
GitLab


From 3d16732102b64b818a9878f0c55308cd29aabc53 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:16:06 +0200
Subject: [PATCH 077/128] postgresql94: 9.4.17 -> 9.4.18

Release notes: https://www.postgresql.org/docs/10/static/release-9-4-18.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index caf921d4a7a..5abf1d65b09 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -101,9 +101,9 @@ in {
   };
 
   postgresql94 = common {
-    version = "9.4.17";
+    version = "9.4.18";
     psqlSchema = "9.4";
-    sha256 = "1inpkwbr2xappz3kq3jr3hsn6mwn167nijcx406q8aq56p9hqcks";
+    sha256 = "1h64yjyrlz3ppsp9k6sm4jihg6n9i7mqhkx4p0hymqzmnbr3g0s2";
   };
 
   postgresql95 = common {
-- 
GitLab


From ac5fdda5a637435a5581702ee9cb27735790e628 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:16:30 +0200
Subject: [PATCH 078/128] postgresql95: 9.5.12 -> 9.5.13

Release notes: https://www.postgresql.org/docs/10/static/release-9-5-13.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 5abf1d65b09..dd4b7eaba70 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -107,9 +107,9 @@ in {
   };
 
   postgresql95 = common {
-    version = "9.5.12";
+    version = "9.5.13";
     psqlSchema = "9.5";
-    sha256 = "167nlrpsnqz63gafgn21j4yc2f5g1mpfkz8qxjxk2xs6crf6zs02";
+    sha256 = "1vm55q9apja6lg672m9xl1zq3iwv2zwnn0d0qr003zan1dmbh22l";
   };
 
   postgresql96 = common {
-- 
GitLab


From d066cecd7de115b6906339ad94f68a93595d56f1 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:16:47 +0200
Subject: [PATCH 079/128] postgresql96: 9.6.8 -> 9.6.9

Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-9-6-9.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index dd4b7eaba70..66162b9a88e 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -113,9 +113,9 @@ in {
   };
 
   postgresql96 = common {
-    version = "9.6.8";
+    version = "9.6.9";
     psqlSchema = "9.6";
-    sha256 = "0w7bwf19wbdd3jjbjv03cnx56qka4801srcbsayk9v792awv7zga";
+    sha256 = "0biy8j69dbvdmrag55pdszpc0702agzqhhcwdx21xp02mzim4ydr";
   };
 
   postgresql100 = common {
-- 
GitLab


From 446ec6df2d67dcba8d0c3cc020980a31445dcb75 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 20 Jul 2018 17:16:58 +0200
Subject: [PATCH 080/128] postgresql100: 10.3 -> 10.4

Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-10-4.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 66162b9a88e..c8b007b36ac 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -119,9 +119,9 @@ in {
   };
 
   postgresql100 = common {
-    version = "10.3";
+    version = "10.4";
     psqlSchema = "10.0";
-    sha256 = "06lkcwsf851z49zqcws5yc77s2yrbaazf2nvbk38hpp31rw6i8kf";
+    sha256 = "0j000bcs9w8wrllg8m7j1lxsd3n2x0yzkack5p35cmxx20iq2q0v";
   };
 
 }
-- 
GitLab


From 55a12c97635868a45e1f9383d64389036a240b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Fri, 20 Jul 2018 19:28:29 +0200
Subject: [PATCH 081/128] nixos/home-assistant: do not always override
 extraComponents (#43845)

Fixes #43843.
---
 nixos/modules/services/misc/home-assistant.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index fdcfe6bc2b8..0756e81612a 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -37,7 +37,7 @@ let
   # List of components used in config
   extraComponents = filter useComponent availableComponents;
 
-  package = if cfg.autoExtraComponents
+  package = if (cfg.autoExtraComponents && cfg.config != null)
     then (cfg.package.override { inherit extraComponents; })
     else cfg.package;
 
@@ -110,7 +110,9 @@ in {
       '';
       description = ''
         Home Assistant package to use.
-        Override <literal>extraPackages</literal> in order to add additional dependencies.
+        Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies.
+        If you specify <option>config</option> and do not set <option>autoExtraComponents</option>
+        to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect.
       '';
     };
 
-- 
GitLab


From fdb9f10e4e63681e881597ffb99fc171d0a38407 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 20 Jul 2018 12:54:32 -0500
Subject: [PATCH 082/128] perl: 1.1.8 -> 1.2, fix w/newer perl

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

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 4deadefcc4b..dc1faf240f5 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -156,11 +156,11 @@ let
       platforms = platforms.all;
     };
   } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
-    crossVersion = "1.1.8";
+    crossVersion = "1.2";
 
     perl-cross-src = fetchurlBoot {
       url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz";
-      sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8";
+      sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r";
     };
 
     # https://github.com/arsv/perl-cross/issues/60
-- 
GitLab


From 063132c22c937253a13ce52281a3a18ffcf73351 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 20 Jul 2018 12:56:07 -0500
Subject: [PATCH 083/128] perl-cross: remove patch that's now included

---
 pkgs/development/interpreters/perl/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index dc1faf240f5..08672d28a1f 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -163,19 +163,10 @@ let
       sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r";
     };
 
-    # https://github.com/arsv/perl-cross/issues/60
-    perl-cross-gcc7-patch = fetchpatch {
-      url = "https://github.com/arsv/perl-cross/commit/07208bc1707b8be3ea170c62c59120020cf0f87f.patch";
-      sha256 = "1gh8w9m5if2s0lrx2x8f8grp74d1l6d46m8jglpjm5a1kf55j810";
-    };
-
     depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
 
     postUnpack = ''
       unpackFile ${perl-cross-src}
-      cd perl-cross-*
-      patch -Np1 -i ${perl-cross-gcc7-patch}
-      cd ..
       cp -R perl-cross-${crossVersion}/* perl-${version}/
     '';
 
-- 
GitLab


From 87f5930c3fb2c852f5243278b7a9da8e117d95e4 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 20 Jul 2018 17:56:59 +0000
Subject: [PATCH 084/128] [bot]: remove unreferenced code

---
 doc/default.nix                               |  2 -
 lib/generators.nix                            |  2 -
 lib/lists.nix                                 |  1 -
 lib/modules.nix                               |  1 -
 lib/tests/misc.nix                            |  4 --
 lib/types.nix                                 |  1 -
 .../config/fonts/fontconfig-ultimate.nix      |  4 +-
 nixos/modules/installer/tools/tools.nix       |  2 -
 nixos/modules/profiles/clone-config.nix       |  1 -
 nixos/modules/programs/nylas-mail.nix         |  1 -
 nixos/modules/programs/shell.nix              |  6 ---
 nixos/modules/programs/ssh.nix                |  1 -
 nixos/modules/programs/xonsh.nix              |  2 -
 nixos/modules/security/acme.nix               |  1 -
 nixos/modules/services/backup/bacula.nix      | 11 ------
 .../backup/crashplan-small-business.nix       |  1 -
 nixos/modules/services/backup/crashplan.nix   |  1 -
 nixos/modules/services/backup/restic.nix      |  1 -
 nixos/modules/services/backup/znapzend.nix    |  7 ----
 .../services/cluster/hadoop/default.nix       |  5 +--
 .../services/cluster/kubernetes/default.nix   |  3 --
 nixos/modules/services/mail/dovecot.nix       |  2 -
 nixos/modules/services/misc/disnix.nix        | 10 -----
 .../modules/services/misc/docker-registry.nix | 37 -------------------
 nixos/modules/services/misc/dysnomia.nix      |  3 --
 nixos/modules/services/misc/emby.nix          |  1 -
 nixos/modules/services/misc/exhibitor.nix     |  1 -
 nixos/modules/services/misc/mediatomb.nix     |  1 -
 nixos/modules/services/misc/nzbget.nix        |  2 +-
 nixos/modules/services/misc/plex.nix          |  1 -
 .../services/misc/taskserver/default.nix      | 10 -----
 nixos/modules/services/networking/gdomap.nix  |  3 --
 nixos/modules/services/networking/i2pd.nix    |  4 +-
 nixos/modules/services/networking/morty.nix   |  2 -
 nixos/modules/services/networking/znc.nix     |  1 -
 nixos/modules/services/system/saslauthd.nix   |  1 -
 .../modules/services/torrent/transmission.nix |  6 ---
 nixos/modules/services/web-apps/frab.nix      |  1 -
 .../web-servers/apache-httpd/default.nix      |  5 ---
 .../web-servers/apache-httpd/owncloud.nix     | 11 ------
 .../web-servers/apache-httpd/trac.nix         |  2 -
 nixos/modules/services/web-servers/uwsgi.nix  |  4 --
 .../services/x11/desktop-managers/gnome3.nix  |  1 -
 nixos/modules/system/boot/stage-1.nix         |  1 -
 nixos/modules/system/boot/stage-2.nix         |  3 --
 nixos/modules/system/boot/systemd-nspawn.nix  |  3 --
 nixos/modules/system/boot/systemd.nix         |  2 -
 nixos/modules/tasks/encrypted-devices.nix     |  1 -
 nixos/modules/tasks/filesystems/zfs.nix       |  1 -
 .../tasks/network-interfaces-scripted.nix     |  1 -
 .../modules/testing/test-instrumentation.nix  |  4 --
 nixos/modules/virtualisation/openvswitch.nix  |  3 --
 nixos/tests/cjdns.nix                         | 10 +----
 nixos/tests/containers-reloadable.nix         |  1 -
 nixos/tests/installer.nix                     |  3 --
 nixos/tests/pam-oath-login.nix                |  2 -
 pkgs/applications/altcoins/mist.nix           |  4 +-
 .../applications/audio/clementine/default.nix |  3 --
 .../editors/emacs-modes/org-packages.nix      |  6 ---
 .../editors/textadept/default.nix             |  1 -
 .../misc/bitcoinarmory/default.nix            |  1 -
 pkgs/applications/misc/llpp/default.nix       |  3 +-
 pkgs/applications/misc/tqsl/default.nix       |  7 ----
 .../networking/browsers/chromium/common.nix   |  4 --
 .../flashplayer/standalone.nix                |  6 ---
 pkgs/applications/office/mendeley/default.nix |  1 -
 .../science/electronics/bitscope/common.nix   |  4 --
 .../science/electronics/bitscope/packages.nix |  4 --
 .../science/math/mathematica/default.nix      |  6 ---
 pkgs/applications/science/misc/golly/beta.nix | 10 +----
 pkgs/applications/virtualization/xen/4.10.nix |  5 ---
 pkgs/applications/virtualization/xen/4.8.nix  |  5 ---
 .../window-managers/way-cooler/way-cooler.nix |  7 ----
 .../window-managers/way-cooler/wc-bg.nix      |  7 ----
 .../window-managers/way-cooler/wc-grab.nix    |  7 ----
 .../window-managers/way-cooler/wc-lock.nix    |  7 ----
 .../dotnetenv/build-solution.nix              |  3 --
 .../fetchdocker/generic-fetcher.nix           |  2 -
 pkgs/build-support/rust/build-rust-crate.nix  | 11 +-----
 pkgs/build-support/rust/carnix.nix            |  6 ---
 pkgs/build-support/rust/default.nix           |  2 -
 pkgs/build-support/vm/windows/default.nix     |  5 ---
 .../compilers/chicken/eggDerivation.nix       |  1 -
 .../development/compilers/gcc/4.8/default.nix |  3 --
 .../development/compilers/gcc/4.9/default.nix |  3 --
 pkgs/development/compilers/gcc/5/default.nix  |  3 --
 pkgs/development/compilers/gcc/6/default.nix  |  3 --
 pkgs/development/compilers/gcc/7/default.nix  |  3 --
 pkgs/development/compilers/gcc/8/default.nix  |  3 --
 .../compilers/gcc/snapshot/default.nix        |  3 --
 .../compilers/ocaml/ber-metaocaml-104.nix     |  1 -
 pkgs/development/haskell-modules/hoogle.nix   |  4 --
 .../python/cpython/2.7/default.nix            |  5 ---
 .../python/cpython/3.4/default.nix            |  1 -
 .../python/cpython/3.5/default.nix            |  1 -
 .../python/cpython/3.6/default.nix            |  1 -
 .../python/cpython/3.7/default.nix            |  1 -
 .../development/interpreters/ruby/default.nix |  2 -
 .../libraries/wiredtiger/default.nix          |  1 -
 .../quicklisp-to-nix-overrides.nix            |  1 -
 .../mobile/androidenv/androidndk.nix          |  3 --
 .../mobile/androidenv/build-app.nix           |  4 --
 .../ocaml-modules/pycaml/default.nix          |  7 +---
 .../python-modules/gurobipy/linux.nix         |  7 +---
 .../ruby-modules/testing/stubs.nix            |  3 --
 .../development/tools/misc/dialog/default.nix |  3 +-
 pkgs/development/tools/phantomjs2/default.nix | 18 ---------
 .../tools/selenium/server/default.nix         |  3 --
 pkgs/games/dwarf-fortress/wrapper/default.nix |  2 -
 pkgs/games/simutrans/default.nix              |  1 -
 pkgs/misc/cups/drivers/canon/default.nix      |  1 -
 pkgs/servers/x11/xorg/overrides.nix           | 12 ------
 pkgs/tools/X11/bumblebee/default.nix          |  5 ---
 pkgs/tools/admin/ansible/default.nix          | 13 -------
 pkgs/tools/filesystems/ceph/generic.nix       |  5 ---
 .../cargo-edit/cargo-edit.nix                 |  7 ----
 pkgs/top-level/haxe-packages.nix              |  1 -
 pkgs/top-level/lua-packages.nix               |  1 -
 118 files changed, 16 insertions(+), 449 deletions(-)

diff --git a/doc/default.nix b/doc/default.nix
index f99aaff5f8a..9ad1b3da69c 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -1,8 +1,6 @@
 let
   pkgs = import ./.. { };
   lib = pkgs.lib;
-  sources = lib.sourceFilesBySuffices ./. [".xml"];
-  sources-langs = ./languages-frameworks;
 in
 pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
diff --git a/lib/generators.nix b/lib/generators.nix
index aa675908703..f5faf700786 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -19,8 +19,6 @@ let
   libStr = lib.strings;
   libAttr = lib.attrsets;
 
-  flipMapAttrs = flip libAttr.mapAttrs;
-
   inherit (lib) isFunction;
 in
 
diff --git a/lib/lists.nix b/lib/lists.nix
index 231c2317c0c..288882924ff 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -64,7 +64,6 @@ rec {
   */
   foldl = op: nul: list:
     let
-      len = length list;
       foldl' = n:
         if n == -1
         then nul
diff --git a/lib/modules.nix b/lib/modules.nix
index 20207b31d35..a443d5ec5d1 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -670,7 +670,6 @@ rec {
     { config, options, ... }:
     let
       fromOpt = getAttrFromPath from options;
-      toOpt = getAttrFromPath to options;
       toOf = attrByPath to
         (abort "Renaming error: option `${showOption to}' does not exist.");
     in
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index eab20d0f14d..3f2d742e788 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -380,10 +380,6 @@ runTests {
 
           resRem7 = res6.replace (a: removeAttrs a ["a"]);
 
-          resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; };
-                            x2 = x.merge { a = 20; }; # now we have 27
-                        in (x2.replace) { a = 10; }; # and override the value by 10
-
           # fixed tests (delayed args): (when using them add some comments, please)
           resFixed1 =
                 let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; });
diff --git a/lib/types.nix b/lib/types.nix
index cf6f2aa46e4..98eff2ac6ff 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -309,7 +309,6 @@ rec {
               }
           else
             def;
-        listOnly = listOf elemType;
         attrOnly = attrsOf elemType;
       in mkOptionType rec {
         name = "loaOf";
diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index c7654ca78c3..7549dc6c065 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -2,9 +2,7 @@
 
 with lib;
 
-let fcBool = x: if x then "<bool>true</bool>" else "<bool>false</bool>";
-
-    cfg = config.fonts.fontconfig.ultimate;
+let cfg = config.fonts.fontconfig.ultimate;
 
     latestVersion  = pkgs.fontconfig.configVersion;
 
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 42b00b2025d..05029628672 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -6,8 +6,6 @@
 with lib;
 
 let
-  cfg = config.installer;
-
   makeProg = args: pkgs.substituteAll (args // {
     dir = "bin";
     isExecutable = true;
diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index 5b4e68beb6a..99d4774584f 100644
--- a/nixos/modules/profiles/clone-config.nix
+++ b/nixos/modules/profiles/clone-config.nix
@@ -31,7 +31,6 @@ let
     let
       relocateNixOS = path:
         "<nixpkgs/nixos" + removePrefix nixosPath (toString path) + ">";
-      relocateOthers = null;
     in
       { nixos = map relocateNixOS partitionedModuleFiles.nixos;
         others = []; # TODO: copy the modules to the install-device repository.
diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix
index 9a6cf755f2a..08a6cd0a604 100644
--- a/nixos/modules/programs/nylas-mail.nix
+++ b/nixos/modules/programs/nylas-mail.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.nylas-mail;
-  defaultUser = "nylas-mail";
 in {
   ###### interface
   options = {
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 56fe347528b..26ef1875992 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -4,12 +4,6 @@
 
 with lib;
 
-let
-
-  cfg = config.environment;
-
-in
-
 {
 
   config = {
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 36289080a82..b4184041d18 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -7,7 +7,6 @@ with lib;
 let
 
   cfg  = config.programs.ssh;
-  cfgd = config.services.openssh;
 
   askPassword = cfg.askPassword;
 
diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix
index 49cc4906e03..f967ca82ac8 100644
--- a/nixos/modules/programs/xonsh.nix
+++ b/nixos/modules/programs/xonsh.nix
@@ -6,8 +6,6 @@ with lib;
 
 let
 
-  cfge = config.environment;
-
   cfg = config.programs.xonsh;
 
 in
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 9e5d636241e..946da92d80e 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -209,7 +209,6 @@ in
           servicesLists = mapAttrsToList certToServices cfg.certs;
           certToServices = cert: data:
               let
-                domain = if data.domain != null then data.domain else cert;
                 cpath = lpath + optionalString (data.activationDelay != null) ".staging";
                 lpath = "${cfg.directory}/${cert}";
                 rights = if data.allowKeysForGroup then "750" else "700";
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index e2806a69539..be02ba56795 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -97,17 +97,6 @@ let
     ${dir_cfg.extraConfig}
     '';
 
-  # TODO: by default use this config
-  bconsole_conf = pkgs.writeText "bconsole.conf"
-    ''
-    Director {
-      Name = ${dir_cfg.name};
-      Address = "localhost";
-      DirPort = ${toString dir_cfg.port};
-      Password = "${dir_cfg.password}";
-    }
-    '';
-
   directorOptions = {name, config, ...}:
   {
     options = {
diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix
index 9497d8c18bb..790dafefe66 100644
--- a/nixos/modules/services/backup/crashplan-small-business.nix
+++ b/nixos/modules/services/backup/crashplan-small-business.nix
@@ -3,7 +3,6 @@
 let
   cfg = config.services.crashplansb;
   crashplansb = pkgs.crashplansb.override { maxRam = cfg.maxRam; };
-  varDir = "/var/lib/crashplan";
 in
 
 with lib;
diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix
index d0af2e416b6..c540cc6e2ae 100644
--- a/nixos/modules/services/backup/crashplan.nix
+++ b/nixos/modules/services/backup/crashplan.nix
@@ -3,7 +3,6 @@
 let
   cfg = config.services.crashplan;
   crashplan = pkgs.crashplan;
-  varDir = "/var/lib/crashplan";
 in
 
 with lib;
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 2d14762e868..409c05221d0 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -127,7 +127,6 @@ with lib;
       mapAttrs' (name: backup:
         let
           extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions;
-          connectTo = elemAt (splitString ":" backup.repository) 1;
           resticCmd = "${pkgs.restic}/bin/restic${extraOptions}";
         in nameValuePair "restic-backups-${name}" ({
           environment = {
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 3d133f82d20..fc8a424190f 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -5,13 +5,6 @@ with types;
 
 let
 
-  # Converts a plan like
-  #   { "1d" = "1h"; "1w" = "1d"; }
-  # into
-  #   "1d=>1h,1w=>1d"
-  attrToPlan = attrs: concatStringsSep "," (builtins.attrValues (
-    mapAttrs (n: v: "${n}=>${v}") attrs));
-
   planDescription = ''
       The znapzend backup plan to use for the source.
     </para>
diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix
index 240938f0d62..f0f5a6ecbfc 100644
--- a/nixos/modules/services/cluster/hadoop/default.nix
+++ b/nixos/modules/services/cluster/hadoop/default.nix
@@ -1,8 +1,5 @@
 { config, lib, pkgs, ...}:
-let 
-  cfg = config.services.hadoop;
-  hadoopConf = import ./conf.nix { hadoop = cfg; pkgs = pkgs; };
-in
+
 with lib;
 {
   imports = [ ./yarn.nix ./hdfs.nix ];
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index e5aba210b01..f56a529afdf 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -36,9 +36,6 @@ let
     })}
   '';
 
-  skipAttrs = attrs: map (filterAttrs (k: v: k != "enable"))
-    (filter (v: !(hasAttr "enable" v) || v.enable) attrs);
-
   infraContainer = pkgs.dockerTools.buildImage {
     name = "pause";
     tag = "latest";
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index a3eb1653df5..04df97fdbbe 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -9,8 +9,6 @@ let
   baseDir = "/run/dovecot2";
   stateDir = "/var/lib/dovecot";
 
-  canCreateMailUserGroup = cfg.mailUser != null && cfg.mailGroup != null;
-
   dovecotConf = concatStrings [
     ''
       base_dir = ${baseDir}
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index b28995a0911..bb3ac1ecf07 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -7,16 +7,6 @@ let
 
   cfg = config.services.disnix;
 
-  dysnomia = pkgs.dysnomia.override (origArgs: {
-    enableApacheWebApplication = config.services.httpd.enable;
-    enableAxis2WebService = config.services.tomcat.axis2.enable;
-    enableEjabberdDump = config.services.ejabberd.enable;
-    enableMySQLDatabase = config.services.mysql.enable;
-    enablePostgreSQLDatabase = config.services.postgresql.enable;
-    enableSubversionRepository = config.services.svnserve.enable;
-    enableTomcatWebApplication = config.services.tomcat.enable;
-    enableMongoDatabase = config.services.mongodb.enable;
-  });
 in
 
 {
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 9a3966ab30a..08031d33c13 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -5,43 +5,6 @@ with lib;
 let
   cfg = config.services.dockerRegistry;
 
-  blobCache = if cfg.enableRedisCache
-    then "redis"
-    else "inmemory";
-
-  registryConfig = {
-    version =  "0.1";
-    log.fields.service = "registry";
-    storage = {
-      cache.blobdescriptor = blobCache;
-      filesystem.rootdirectory = cfg.storagePath;
-      delete.enabled = cfg.enableDelete;
-    };
-    http = {
-      addr = ":${builtins.toString cfg.port}";
-      headers.X-Content-Type-Options = ["nosniff"];
-    };
-    health.storagedriver = {
-      enabled = true;
-      interval = "10s";
-      threshold = 3;
-    };
-  };
-
-  registryConfig.redis = mkIf cfg.enableRedisCache {
-    addr = "${cfg.redisUrl}";
-    password = "${cfg.redisPassword}";
-    db = 0;
-    dialtimeout = "10ms";
-    readtimeout = "10ms";
-    writetimeout = "10ms";
-    pool = {
-      maxidle = 16;
-      maxactive = 64;
-      idletimeout = "300s";
-    };
-  };
-
   configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));
 
 in {
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index 9e66e0811ab..ba74b18b697 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -62,9 +62,6 @@ let
       cd $out
 
       ${concatMapStrings (containerName:
-        let
-          components = cfg.components."${containerName}";
-        in
         linkMutableComponents { inherit containerName; }
       ) (builtins.attrNames cfg.components)}
     '';
diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
index b1968784af0..92a68b60251 100644
--- a/nixos/modules/services/misc/emby.nix
+++ b/nixos/modules/services/misc/emby.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.emby;
-  emby = pkgs.emby;
 in
 {
   options = {
diff --git a/nixos/modules/services/misc/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix
index 685e652c0ba..a90c7f402e7 100644
--- a/nixos/modules/services/misc/exhibitor.nix
+++ b/nixos/modules/services/misc/exhibitor.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.exhibitor;
-  exhibitor = cfg.package;
   exhibitorConfig = ''
     zookeeper-install-directory=${cfg.baseDir}/zookeeper
     zookeeper-data-directory=${cfg.zkDataDir}
diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index 5c1977d28de..e8e9c0946d7 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
 
-  uid = config.ids.uids.mediatomb;
   gid = config.ids.gids.mediatomb;
   cfg = config.services.mediatomb;
 
diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix
index f79a04a1d74..a472b6c7157 100644
--- a/nixos/modules/services/misc/nzbget.nix
+++ b/nixos/modules/services/misc/nzbget.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.services.nzbget;
-  nzbget = pkgs.nzbget; in {
+in {
   options = {
     services.nzbget = {
       enable = mkEnableOption "NZBGet";
diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index 85f1d4a8556..8fe5879c276 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.services.plex;
-  plex = pkgs.plex;
 in
 {
   options = {
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index ba9f52f1904..7daf12f9171 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -7,16 +7,6 @@ let
 
   taskd = "${pkgs.taskserver}/bin/taskd";
 
-  mkVal = val:
-    if val == true then "true"
-    else if val == false then "false"
-    else if isList val then concatStringsSep ", " val
-    else toString val;
-
-  mkConfLine = key: val: let
-    result = "${key} = ${mkVal val}";
-  in optionalString (val != null && val != []) result;
-
   mkManualPkiOption = desc: mkOption {
     type = types.nullOr types.path;
     default = null;
diff --git a/nixos/modules/services/networking/gdomap.nix b/nixos/modules/services/networking/gdomap.nix
index b3fd91d037f..3d829cb6913 100644
--- a/nixos/modules/services/networking/gdomap.nix
+++ b/nixos/modules/services/networking/gdomap.nix
@@ -2,9 +2,6 @@
 
 with lib;
 
-let
-  cfg = config.services.gdomap;
-in
 {
   #
   # interface
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 8875309143f..4f219fe56b4 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -103,7 +103,7 @@ let
 
     ${flip concatMapStrings
       (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)
-      (proto: let portStr = toString proto.port; in ''
+      (proto: ''
         [${proto.name}]
         enabled = ${boolToString proto.enable}
         address = ${proto.address}
@@ -122,7 +122,7 @@ let
     # DO NOT EDIT -- this file has been generated automatically.
     ${flip concatMapStrings
       (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
-      (tun: let portStr = toString tun.port; in ''
+      (tun: ''
         [${tun.name}]
         type = client
         destination = ${tun.destination}
diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix
index f24562f1181..cc81e27e939 100644
--- a/nixos/modules/services/networking/morty.nix
+++ b/nixos/modules/services/networking/morty.nix
@@ -6,8 +6,6 @@ let
 
   cfg = config.services.morty;
 
-  configFile = cfg.configFile;
-
 in
 
 {
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 6f477e3b146..f817db2ad00 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -26,7 +26,6 @@ let
   };
 
   # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
-  notNull = a: ! isNull a;
   mkZncConf = confOpts: ''
     Version = 1.6.3
     ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules}
diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix
index 281716cf186..c8ddca9a0db 100644
--- a/nixos/modules/services/system/saslauthd.nix
+++ b/nixos/modules/services/system/saslauthd.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
 
-  nssModulesPath = config.system.nssModules.path;
   cfg = config.services.saslauthd;
 
 in
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index bf4fb76d0c0..96413d2dd56 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -13,12 +13,6 @@ let
   settingsDir = "${homeDir}/.config/transmission-daemon";
   settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings);
 
-  # Strings must be quoted, ints and bools must not (for settings.json).
-  toOption = x:
-    if isBool x then boolToString x
-    else if isInt x then toString x
-    else toString ''"${x}"'';
-
   # for users in group "transmission" to have access to torrents
   fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings;
 
diff --git a/nixos/modules/services/web-apps/frab.nix b/nixos/modules/services/web-apps/frab.nix
index d411727a1a5..fb95e024817 100644
--- a/nixos/modules/services/web-apps/frab.nix
+++ b/nixos/modules/services/web-apps/frab.nix
@@ -6,7 +6,6 @@ let
   cfg = config.services.frab;
 
   package = pkgs.frab;
-  ruby = package.ruby;
 
   databaseConfig = builtins.toJSON { production = cfg.database; };
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index eb8ee9b5cf4..73607c6f9a3 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -98,11 +98,6 @@ let
   allSubservices = mainSubservices ++ concatMap subservicesFor mainCfg.virtualHosts;
 
 
-  # !!! should be in lib
-  writeTextInDir = name: text:
-    pkgs.runCommand name {inherit text;} "mkdir -p $out; echo -n \"$text\" > $out/$name";
-
-
   enableSSL = any (vhost: vhost.enableSSL) allHosts;
 
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
index 82b8bf3e30d..6345a9a5693 100644
--- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
@@ -4,17 +4,6 @@ with lib;
 
 let
 
-  httpd = serverInfo.serverConfig.package;
-
-  version24 = !versionOlder httpd.version "2.4";
-
-  allGranted = if version24 then ''
-    Require all granted
-  '' else ''
-    Order allow,deny
-    Allow from all
-  '';
-
   owncloudConfig = pkgs.writeText "config.php"
     ''
       <?php
diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index 35b9ab56087..28b411a64b6 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -12,8 +12,6 @@ let
     apacheHttpd = httpd;
   };
 
-  pythonLib = p: "${p}/";
-
   httpd = serverInfo.serverConfig.package;
 
   versionPre24 = versionOlder httpd.version "2.4";
diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 3ef78ea77cb..3f858d90fa4 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -27,10 +27,6 @@ let
         else if hasPython3 then uwsgi.python3
         else null;
 
-      pythonPackages = pkgs.pythonPackages.override {
-        inherit python;
-      };
-
       pythonEnv = python.withPackages (c.pythonPackages or (self: []));
 
       uwsgiCfg = {
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 27b62df7097..9fb8f44b242 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -10,7 +10,6 @@ let
     let
       pkgName = drv: (builtins.parseDrvName drv.name).name;
       ysNames = map pkgName ys;
-      res = (filter (x: !(builtins.elem (pkgName x) ysNames)) xs);
     in
       filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index b6a7081b896..71b806a0b4e 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -11,7 +11,6 @@ let
 
   udev = config.systemd.package;
 
-  kernelPackages = config.boot.kernelPackages;
   modulesTree = config.system.modulesTree;
   firmware = config.hardware.firmware;
 
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 78afbd8dbc1..9fd89b6319d 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -4,9 +4,6 @@ with lib;
 
 let
 
-  kernel = config.boot.kernelPackages.kernel;
-  activateConfiguration = config.system.activationScripts.script;
-
   bootStage2 = pkgs.substituteAll {
     src = ./stage-2-init.sh;
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index 64b3b8b584e..83fef835436 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -6,9 +6,6 @@ with import ./systemd-lib.nix { inherit config lib pkgs; };
 
 let
   cfg = config.systemd.nspawn;
-  assertions = [
-    # boot = true -> processtwo != true
-  ];
 
   checkExec = checkUnitConfig "Exec" [
     (assertOnlyFields [
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6f5b15372d7..500c2d40661 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -188,8 +188,6 @@ let
       "timers.target"
     ];
 
-  boolToString = value: if value then "yes" else "no";
-
   makeJobScript = name: text:
     let mkScriptName =  s: (replaceChars [ "\\" ] [ "-" ] (shellEscape s) );
         x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; };
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index da0c9408d89..11ed5d7e4d0 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -7,7 +7,6 @@ let
   encDevs = filter (dev: dev.encrypted.enable) fileSystems;
   keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs;
   keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs;
-  isIn = needle: haystack: filter (p: p == needle) haystack != [];
   anyEncrypted =
     fold (j: v: v || j.encrypted.enable) false encDevs;
 
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 39f51c36367..7120856387e 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -9,7 +9,6 @@ with lib;
 
 let
 
-  cfgSpl = config.boot.spl;
   cfgZfs = config.boot.zfs;
   cfgSnapshots = config.services.zfs.autoSnapshot;
   cfgSnapFlags = cfgSnapshots.flags;
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index c4a2bd1f75f..f3f6a19318a 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -7,7 +7,6 @@ let
 
   cfg = config.networking;
   interfaces = attrValues cfg.interfaces;
-  hasVirtuals = any (i: i.virtual) interfaces;
 
   slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
     ++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 7a7fcbecd64..114e0ca39fa 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -6,10 +6,6 @@
 with lib;
 with import ../../lib/qemu-flags.nix { inherit pkgs; };
 
-let
-  kernel = config.boot.kernelPackages.kernel;
-in
-
 {
 
   # This option is a dummy that if used in conjunction with
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 38b138e0632..bb8b9172f23 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -51,9 +51,6 @@ in {
     # Where the communication sockets live
     runDir = "/var/run/openvswitch";
 
-    # Where the config database live (can't be in nix-store)
-    stateDir = "/var/db/openvswitch";
-
     # The path to the an initialized version of the database
     db = pkgs.stdenv.mkDerivation {
       name = "vswitch.db";
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 4d3b58abc6e..db89c496944 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -2,7 +2,6 @@ let
   carolKey = "2d2a338b46f8e4a8c462f0c385b481292a05f678e19a2b82755258cf0f0af7e2";
   carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k";
   carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52";
-  carolIp4 = "192.168.0.9";
 
   basicConfig =
     { config, pkgs, ... }:
@@ -44,9 +43,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       bob =
         { config, lib, nodes, ... }:
 
-        let carolIp4 = lib.mkForce nodes.carol.config.networking.interfaces.eth1; in
-
-          { imports = [ basicConfig ];
+        { imports = [ basicConfig ];
 
           networking.interfaces.eth1.ipv4.addresses = [
             { address = "192.168.0.2"; prefixLength = 24; }
@@ -67,10 +64,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       # but knows neither Alice or Bob.
       carol =
         { config, lib, nodes, ... }:
-          let
-            carolIp4 = (lib.mkForce nodes.carol.config.networking.interfaces.eth1);
-          in
-          { imports = [ basicConfig ];
+        { imports = [ basicConfig ];
 
           environment.etc."cjdns.keys".text = ''
             CJDNS_PRIVATE_KEY=${carolKey}
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index 5fb42f2272b..15862ac64c1 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -45,7 +45,6 @@ in {
   };
 
   testScript = {nodes, ...}: let
-    originalSystem = nodes.client.config.system.build.toplevel;
     c1System = nodes.client_c1.config.system.build.toplevel;
     c2System = nodes.client_c2.config.system.build.toplevel;
   in ''
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 8ce9bc21ff7..59226484bd8 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -58,9 +58,6 @@ let
     '';
 
 
-  channelContents = [ pkgs.rlwrap ];
-
-
   # The test script boots a NixOS VM, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix
index eb5966d9213..9f40ecfe865 100644
--- a/nixos/tests/pam-oath-login.nix
+++ b/nixos/tests/pam-oath-login.nix
@@ -12,8 +12,6 @@ let
   # and picking a the first 4:
   oathSnakeOilPassword1 = "143349";
   oathSnakeOilPassword2 = "801753";
-  oathSnakeOilPassword3 = "019933";
-  oathSnakeOilPassword4 = "403895";
 
   alicePassword = "foobar";
   # Generated via: mkpasswd -m sha-512 and passing in "foobar"
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix
index c38e613fdd4..cb8d01467a2 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@@ -26,7 +26,7 @@ let
   };
 
   mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
-    inherit name version;
+    inherit name version meta;
 
     src = {
       i686-linux = fetchurl {
@@ -56,7 +56,7 @@ let
   });
 in
 buildFHSUserEnv {
-  inherit name;
+  inherit name meta;
 
   targetPkgs = pkgs: with pkgs; [
      mist
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 6379975e951..b8044972576 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -4,7 +4,6 @@
 , qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
 
 let
-  withSpotify = config.clementine.spotify or false;
   withIpod = config.clementine.ipod or false;
   withMTP = config.clementine.mtp or true;
   withCD = config.clementine.cd or true;
@@ -12,8 +11,6 @@ let
 
   version = "1.3.1";
 
-  exeName = "clementine";
-
   src = fetchurl {
     url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz;
     sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq";
diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix
index b8543841a7f..8df45ffb61e 100644
--- a/pkgs/applications/editors/emacs-modes/org-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/org-packages.nix
@@ -23,12 +23,6 @@ self:
 
     super = imported;
 
-    markBroken = pkg: pkg.override {
-      elpaBuild = args: self.elpaBuild (args // {
-        meta = (args.meta or {}) // { broken = true; };
-      });
-    };
-
     overrides = {
     };
 
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 4f1a29278be..818183b9852 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -56,7 +56,6 @@ let
   gtdialog_zip   = "gtdialog_1.3.zip";
   cdk_tgz        = "cdk-5.0-20150928.tgz";
   termkey_tgz    = "libtermkey-0.17.tar.gz";
-  bombay_zip     = "bombay.zip";
 
   scinterm_url   = "http://foicica.com/scinterm/download/" + scinterm_zip;
   tre_url        = "https://github.com/laurikari/tre/archive/" + tre_zip;
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
index a9d32d4b252..3245a56e9de 100644
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@@ -6,7 +6,6 @@
 let
 
   version = "0.96.1";
-  sitePackages = pythonPackages.python.sitePackages;
   inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted;
 
 in buildPythonApplication {
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 959ed6b11ba..25067e3bba5 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -3,8 +3,7 @@
 
 assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
 
-let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "llpp-${version}";
   version = "2018-03-02";
 
diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix
index b41f5c9a0a7..f001cbcaab9 100644
--- a/pkgs/applications/misc/tqsl/default.nix
+++ b/pkgs/applications/misc/tqsl/default.nix
@@ -1,12 +1,5 @@
 { stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
 
-let
-  lib_suffix =
-  if stdenv.system == "x86_64-linux" then
-    "64"
-  else
-    "";
-in
 stdenv.mkDerivation rec {
   name = "tqsl-${version}";
   version = "2.3.1";
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 021c048669f..196e2eb79bd 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -43,10 +43,6 @@ let
   # source tree.
   extraAttrs = buildFun base;
 
-  gentooPatch = name: sha256: fetchpatch {
-    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}";
-    inherit sha256;
-  };
   githubPatch = commit: sha256: fetchpatch {
     url = "https://github.com/chromium/chromium/commit/${commit}.patch";
     inherit sha256;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index dbf0bbbd4d5..8420dbdaaa8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -47,12 +47,6 @@
 , debug ? false
 }:
 
-let
-  arch =
-    if stdenv.system == "x86_64-linux" then
-      "x86_64"
-    else throw "Flash Player is not supported on this platform";
-in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
   version = "30.0.0.134";
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index cf40392c6dd..693fa63661b 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -36,7 +36,6 @@
 
 let
   arch32 = "i686-linux";
-  arch64 = "x86_64-linux";
 
   arch = if stdenv.system == arch32
     then "i386"
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix
index e1db7131a65..ba2d5221cc5 100644
--- a/pkgs/applications/science/electronics/bitscope/common.nix
+++ b/pkgs/applications/science/electronics/bitscope/common.nix
@@ -60,10 +60,6 @@ let
       ${(wrapBinary libs) attrs.toolName}
     '';
   });
-  fhs = target: buildFHSUserEnv {
-    inherit (pkg) name;
-    runScript = target;
-  };
 in buildFHSUserEnv {
   name = "${attrs.toolName}-${attrs.version}";
   runScript = "${pkg.outPath}/bin/${attrs.toolName}";
diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix
index c10e9de851a..dc333f3d3b7 100644
--- a/pkgs/applications/science/electronics/bitscope/packages.nix
+++ b/pkgs/applications/science/electronics/bitscope/packages.nix
@@ -6,10 +6,6 @@
 }:
 
 let
-  wrapBinary = libPaths: binaryName: ''
-    wrapProgram "$out/bin/${binaryName}" \
-      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath libPaths}"
-  '';
   mkBitscope = callPackage (import ./common.nix) { };
 in {
   chart = let
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 97781a69ce6..d2a518e9db0 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -24,12 +24,6 @@
 }:
 
 let
-  platform =
-    if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then
-      "Linux"
-    else
-      throw "Mathematica requires i686-linux or x86_64 linux";
-
   l10n =
     with stdenv.lib;
     with callPackage ./l10ns.nix {};
diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix
index 5b210fa4bf6..f423adbe786 100644
--- a/pkgs/applications/science/misc/golly/beta.nix
+++ b/pkgs/applications/science/misc/golly/beta.nix
@@ -2,15 +2,7 @@
 , wxGTK, perl, python2, zlib, libGLU_combined, libX11
 , automake, autoconf
 }:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="golly";
-    version="2.8";
-    name="${baseName}-${version}";
-    hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
-  };
-in
+
 stdenv.mkDerivation rec {
   name = "golly-${version}";
   version = "2.8.99.2.20161122";
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
index dab90a1ed78..5e21f7ee608 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -22,11 +22,6 @@ with stdenv.lib;
 # and try applying all the ones we don't have yet.
 
 let
-  xsaPatch = { name , sha256 }: (fetchpatch {
-    url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
-    inherit sha256;
-  });
-
   xsa = import ./xsa-patches.nix { inherit fetchpatch; };
 
   qemuMemfdBuildFix = fetchpatch {
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 79be1be1190..f99cdb69d2a 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -22,11 +22,6 @@ with stdenv.lib;
 # and try applying all the ones we don't have yet.
 
 let
-  xsaPatch = { name , sha256 }: (fetchpatch {
-    url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
-    inherit sha256;
-  });
-
   xsa = import ./xsa-patches.nix { inherit fetchpatch; };
 
   xenlockprofpatch = (fetchpatch {
diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix
index 9ba6db36772..8a740b15500 100644
--- a/pkgs/applications/window-managers/way-cooler/way-cooler.nix
+++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix
@@ -1,13 +1,6 @@
 # Generated by carnix 0.6.5: carnix -o way-cooler.nix Cargo.lock
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
index d1c0993982a..c63123db7cc 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix
@@ -1,13 +1,6 @@
 # Generated by carnix 0.6.5: carnix -o wc-bg.nix Cargo.lock
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
index 253281b6a9a..947a9653e56 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix
@@ -1,13 +1,6 @@
 # Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
index 80775112abc..008df5479ce 100644
--- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix
+++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix
@@ -1,13 +1,6 @@
 # Generated by carnix 0.6.5: carnix -o wc-lock.nix Cargo.lock
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix
index b1853bf7364..62370d361cd 100644
--- a/pkgs/build-support/dotnetenv/build-solution.nix
+++ b/pkgs/build-support/dotnetenv/build-solution.nix
@@ -14,9 +14,6 @@
 
 assert modifyPublicMain -> mainClassFile != null;
 
-let
-  wrapperCS = ./Wrapper.cs.in;  
-in
 stdenv.mkDerivation {
   inherit name src;
   
diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix
index e051cee0843..3b0c3377046 100644
--- a/pkgs/build-support/fetchdocker/generic-fetcher.nix
+++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix
@@ -2,8 +2,6 @@
 let
   awk                   = "${gawk}/bin/awk";
   dockerCredentialsFile = import ./credentials.nix;
-  stripScheme           =
-    builtins.replaceStrings [ "https://" "http://" ] [ "" "" ];
 in
 { fetcher
 , name
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index be76c283bab..7f21b66ce12 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -187,20 +187,12 @@ let makeDeps = dependencies:
                    crateType, metadata, crateBin, finalBins,
                    extraRustcOpts, verbose, colors }:
 
-      let depsDir = lib.concatStringsSep " " dependencies;
-          completeDepsDir = lib.concatStringsSep " " completeDeps;
-          completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
-          deps = makeDeps dependencies;
-          optLevel = if release then 3 else 0;
+      let deps = makeDeps dependencies;
           rustcOpts =
             lib.lists.foldl' (opts: opt: opts + " " + opt)
               (if release then "-C opt-level=3" else "-C debuginfo=2")
               (["-C codegen-units=1"] ++ extraRustcOpts);
           rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
-          version_ = lib.splitString "-" crateVersion;
-          versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
-          version = lib.splitString "." (lib.head version_);
-          authors = lib.concatStringsSep ":" crateAuthors;
       in ''
       runHook preBuild
       norm=""
@@ -348,7 +340,6 @@ crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, cr
   preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:
 
 let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_);
-    release_ = release;
     dependencies_ = dependencies;
     buildDependencies_ = buildDependencies;
     processedAttrs = [
diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix
index 5b79d607f9d..22d3fcd0c1f 100644
--- a/pkgs/build-support/rust/carnix.nix
+++ b/pkgs/build-support/rust/carnix.nix
@@ -2,12 +2,6 @@
 { lib, buildPlatform, buildRustCrate, fetchgit }:
 let kernel = buildPlatform.parsed.kernel.name;
     abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index d7d03aae33e..59e8c3e7f7e 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -20,8 +20,6 @@ in
 assert cargoVendorDir == null -> cargoSha256 != "unset";
 
 let
-  lib = stdenv.lib;
-
   cargoDeps = if cargoVendorDir == null
     then fetchcargo {
         inherit name src srcs sourceRoot cargoUpdateHook;
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index f1575219982..e5ff13f0da9 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -21,11 +21,6 @@ let
 
 in {
   runInWindowsVM = drv: let
-    newDrv = drv.override {
-      stdenv = drv.stdenv.override {
-        shell = "/bin/sh";
-      };
-    };
   in pkgs.lib.overrideDerivation drv (attrs: let
     bootstrap = bootstrapper attrs.windowsImage;
   in {
diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix
index 58247e5aeb5..bcb7a763fb6 100644
--- a/pkgs/development/compilers/chicken/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/eggDerivation.nix
@@ -8,7 +8,6 @@
 let
   libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/";
   overrides = import ./overrides.nix;
-  lib = stdenv.lib;
   baseName = (builtins.parseDrvName name).name;
   override = if builtins.hasAttr baseName overrides
    then
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 75259ed3983..15071fd2ba5 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -54,9 +54,6 @@ with builtins;
 
 let version = "4.8.5";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches = [ ]
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 27164176b53..006cbdf40dc 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -54,9 +54,6 @@ with builtins;
 
 let version = "4.9.4";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index eeeabe301d1..f360ed135d7 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -53,9 +53,6 @@ with builtins;
 let version = "5.5.0";
     sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index e5c77568a0e..02a00350162 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -52,9 +52,6 @@ with builtins;
 
 let version = "6.4.0";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index d671743ee62..84323cca823 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -41,9 +41,6 @@ with builtins;
 
 let version = "7.3.0";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index e8c03c38230..85c03bc440f 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -41,9 +41,6 @@ with builtins;
 
 let version = "8.1.0";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 4e69d7e0408..b00f180bbc7 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -42,9 +42,6 @@ with builtins;
 
 let version = "7-20170409";
 
-    # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
-
     enableParallelBuilding = true;
 
     patches =
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
index 16d7e2580b3..e084a2dcf94 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
@@ -2,7 +2,6 @@
 
 let
    useX11 = stdenv.isi686 || stdenv.isx86_64;
-   useNativeCompilers = stdenv.isi686 || stdenv.isx86_64 || stdenv.isMips;
    inherit (stdenv.lib) optionals optionalString;
 in
 
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 38e8dfd24c4..7b3fe8fba02 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -36,10 +36,6 @@ let
     if !isGhcjs
     then "haddock"
     else "haddock-ghcjs";
-  ghcName =
-    if !isGhcjs
-    then "ghc"
-    else "ghcjs";
   ghcDocLibDir =
     if !isGhcjs
     then ghc.doc + ''/share/doc/ghc*/html/libraries''
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index cd1a0fc6e18..d37f59250d5 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -33,7 +33,6 @@ let
   majorVersion = "2.7";
   minorVersion = "15";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
@@ -161,10 +160,6 @@ let
     # don't rely on detecting glibc-isms.
   ++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no";
 
-  postConfigure = if hostPlatform.isCygwin then ''
-    sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),'
-  '' else null;
-
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
     [ bzip2 openssl zlib ]
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 7da2cfdd152..a8b6ffd1da9 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -29,7 +29,6 @@ let
   majorVersion = "3.4";
   minorVersion = "8";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 434c2338270..2bbdb8bdd84 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -29,7 +29,6 @@ let
   majorVersion = "3.5";
   minorVersion = "5";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 9ea0876b1ce..f8628186d79 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -29,7 +29,6 @@ let
   majorVersion = "3.6";
   minorVersion = "6";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
index ad88895fa67..e0cc198c096 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -29,7 +29,6 @@ let
   majorVersion = "3.7";
   minorVersion = "0";
   minorVersionSuffix = "";
-  pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "python${majorVersion}";
   sitePackages = "lib/${libPrefix}/site-packages";
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 89d394c8756..bb6f2758f4c 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -32,8 +32,6 @@ let
   generic = { version, sha256 }: let
     ver = version;
     tag = ver.gitTag;
-    isRuby20 = ver.majMin == "2.0";
-    isRuby21 = ver.majMin == "2.1";
     isRuby25 = ver.majMin == "2.5";
     baseruby = self.override { useRailsExpress = false; };
     self = lib.makeOverridable (
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index c905c40cf96..c4d94af850d 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -13,7 +13,6 @@ let
     + optionalString (val != null && cond != false) "=${val}";
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
-  mkOther = mkFlag "" "" true;
 
   shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
 
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 111d9952749..1dc2488f55a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -1,6 +1,5 @@
 {pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}:
 let
-  addDeps = newdeps: x: {deps = x.deps ++ newdeps;};
   addNativeLibs = libs: x: { propagatedBuildInputs = libs; };
   skipBuildPhase = x: {
     overrides = y: ((x.overrides y) // { buildPhase = "true"; });
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 1e8ea65c73d..fd8651e89cf 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -25,9 +25,6 @@ stdenv.mkDerivation rec {
     sed_script_1 =
       "'s|^PROGDIR=`dirname $0`" +
       "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
-    sed_script_2 =
-      "'s|^MYNDKDIR=`dirname $0`" +
-      "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";
     runtime_paths = (lib.makeBinPath [
       coreutils file findutils
       gawk gnugrep gnused
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index 390c5eb7a20..20b3ff3b8f5 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -7,10 +7,6 @@ args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ?
 assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null;
 
 let
-  platformName = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "linux"
-    else if stdenv.system == "x86_64-darwin" then "macosx"
-    else throw "Platform: ${stdenv.system} is not supported!";
-
   androidsdkComposition = androidsdk {
     inherit platformVersions useGoogleAPIs;
     abiVersions = [];
diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix
index 7421e2fa0b1..46453f30d3b 100644
--- a/pkgs/development/ocaml-modules/pycaml/default.nix
+++ b/pkgs/development/ocaml-modules/pycaml/default.nix
@@ -2,12 +2,7 @@
 
 # This is the original pycaml version with patches from debian.
 
-let debian = fetchurl {
-      url = "mirror://debian/pool/main/p/pycaml/pycaml_0.82-14.debian.tar.gz";
-      sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1";
-    };
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   name = "pycaml-0.82-14";
 
   srcs = [
diff --git a/pkgs/development/python-modules/gurobipy/linux.nix b/pkgs/development/python-modules/gurobipy/linux.nix
index 8afe6379dc7..d572b10fd62 100644
--- a/pkgs/development/python-modules/gurobipy/linux.nix
+++ b/pkgs/development/python-modules/gurobipy/linux.nix
@@ -1,10 +1,7 @@
 { fetchurl, python }:
 assert python.pkgs.isPy27;
-let utf =
-  if python.ucsEncoding == 2 then "16"
-  else if python.ucsEncoding == 4 then "32"
-  else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}";
-in python.pkgs.buildPythonPackage
+
+python.pkgs.buildPythonPackage
   { pname = "gurobipy";
     version = "7.5.2";
     src = fetchurl
diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix
index 3585681478c..7e6d1102f66 100644
--- a/pkgs/development/ruby-modules/testing/stubs.nix
+++ b/pkgs/development/ruby-modules/testing/stubs.nix
@@ -1,8 +1,5 @@
 { stdenv, lib, ruby, callPackage, ... }:
 let
-  real = {
-    inherit (stdenv) mkDerivation;
-  };
   mkDerivation = {name, ...}@argSet:
   derivation {
     inherit name;
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index 82b224b37f4..09d1276ed42 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -3,8 +3,7 @@
 , unicodeSupport ? true
 }:
 
-let optional = stdenv.lib.optional;
-    optStr = stdenv.lib.optionalString;
+let optStr = stdenv.lib.optionalString;
     buildShared = !stdenv.isDarwin;
 in
 
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index 3c062dbe1ab..949d798f7e8 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -5,24 +5,6 @@
 }:
 
 let
-  fakeXcrun = writeScriptBin "xcrun" ''
-    #!${stdenv.shell}
-    echo >&2 "Fake xcrun: ''$@"
-    args=()
-    while (("$#")); do
-      case "$1" in
-        -sdk*) shift;;
-        -find*) shift;;
-        *) args+=("$1");;
-      esac
-      shift
-    done
-
-    if [ "''${#args[@]}" -gt "0" ]; then
-      echo >&2 "Fake xcrun: ''${args[@]}"
-      exec "''${args[@]}"
-    fi
-  '';
   fakeClang = writeScriptBin "clang" ''
     #!${stdenv.shell}
     if [[ "$@" == *.c ]]; then
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index 3b1e8c2c8a7..c3d71e2b2a3 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -6,9 +6,6 @@ with stdenv.lib;
 let
   minorVersion = "3.6";
   patchVersion = "0";
-  arch = if stdenv.system == "x86_64-linux" then "amd64"
-         else if stdenv.system == "i686-linux" then "i386"
-         else "";
 
 in stdenv.mkDerivation rec {
   name = "selenium-server-standalone-${version}";
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 5eebbf77d2b..6efe004fa9e 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -22,8 +22,6 @@ let
     then builtins.getAttr theme themes
     else theme;
 
-  twbtOnlyWithDFHack = assert (enableDFHack || !enableTWBT); true;
-
   unBool = b: if b then "YES" else "NO";
 
   # These are in inverse order for first packages to override the next ones.
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index ada2520a097..ccece066cdc 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -16,7 +16,6 @@ let
   ver3 = "2";
   version =   "${ver1}.${ver2}.${ver3}";
   ver_dash =  "${ver1}-${ver2}-${ver3}";
-  ver2_dash = "${ver1}-${ver2}";
 
   binary_src = fetchurl {
     url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip";
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index 1c0b8e13ab0..9c5ef1d0283 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -4,7 +4,6 @@ let
 
   i686_NIX_GCC = pkgsi686Linux.callPackage ({gcc}: gcc) {};
   i686_libxml2 = pkgsi686Linux.callPackage ({libxml2}: libxml2) {};
-  i686_glibc = pkgsi686Linux.callPackage ({glibc}: glibc) {};
 
   src_canon = fetchurl {
     url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f45ee7500ed..2438c49d9cb 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -8,18 +8,6 @@ let
   malloc0ReturnsNullCrossFlag = stdenv.lib.optional
     (stdenv.hostPlatform != stdenv.buildPlatform)
     "--enable-malloc0returnsnull";
-
-  gitRelease = { libName, version, rev, sha256 } : attrs : attrs // {
-    name = libName + "-" + version;
-    src = args.fetchgit {
-      url = git://anongit.freedesktop.org/xorg/lib/ + libName;
-      inherit rev sha256;
-    };
-    buildInputs = attrs.buildInputs ++ [ xorg.utilmacros  ];
-    preConfigure = (attrs.preConfigure or "") + "\n./autogen.sh";
-  };
-
-  compose = f: g: x: f (g x);
 in
 {
   bdftopcf = attrs: attrs // {
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 14fe769db6b..7345528dad2 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -36,11 +36,6 @@
 let
   version = "3.2.1";
 
-  primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; };
-  primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; };
-
-  primusLibs = lib.makeLibraryPath ([ primus ] ++ lib.optional (primusLib_i686 != null) primus_i686);
-
   nvidia_x11s = [ nvidia_x11 ]
                 ++ lib.optional nvidia_x11.useGLVND libglvnd
                 ++ lib.optionals (nvidia_x11_i686 != null)
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 363214129b2..b942ae6a006 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -3,19 +3,6 @@
 }:
 
 let
-  oldJinja = python2.override {
-    packageOverrides = self: super: {
-      jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec {
-        version = "2.8.1";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
-        };
-        doCheck = false;
-      });
-    };
-  };
-
   generic = { version, sha256, py ? python2 }: py.pkgs.buildPythonPackage rec {
     pname = "ansible";
     inherit version;
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 4325a935536..784ca7ec4f6 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -44,8 +44,6 @@ let
   optExpat = shouldUsePkg expat;
   optCurl = shouldUsePkg curl;
   optFuse = shouldUsePkg fuse;
-  optLibibverbs = shouldUsePkg libibverbs;
-  optLibrdmacm = shouldUsePkg librdmacm;
   optLibedit = shouldUsePkg libedit;
   optLibatomic_ops = shouldUsePkg libatomic_ops;
   optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client;
@@ -62,9 +60,6 @@ let
   optLibxfs = shouldUsePkg libxfs;
   optZfs = shouldUsePkg zfs;
 
-  hasMon = true;
-  hasMds = true;
-  hasOsd = true;
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
 
diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
index 042c999be0d..67aa52f4789 100644
--- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
+++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
@@ -3,13 +3,6 @@
 
 with pkgs;
 let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
     updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
     mapFeatures = features: map (fun: fun { features = features; });
     mkFeatures = feat: lib.lists.foldl (features: featureName:
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index 5a85dc3433b..3ac8d5f164d 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -2,7 +2,6 @@
 
 let
   self = haxePackages;
-  callPackage = newScope self;
   haxePackages = with self; {
 
     withCommas = stdenv.lib.replaceChars ["."] [","];
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 017b9fca3f9..520db16d366 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -13,7 +13,6 @@
 }:
 
 let
-  isLua51 = lua.luaversion == "5.1";
   isLua52 = lua.luaversion == "5.2";
   isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit";
 
-- 
GitLab


From 6d2857a311a6586860cb0c70778b035c92d9c88c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 20 Jul 2018 19:36:12 +0000
Subject: [PATCH 085/128] [bot] treewide: remove unused 'inherit' in let blocks

---
 lib/attrsets.nix                                             | 4 ++--
 lib/composable-derivation.nix                                | 2 +-
 lib/customisation.nix                                        | 5 -----
 lib/types.nix                                                | 2 +-
 nixos/modules/programs/tmux.nix                              | 2 +-
 nixos/modules/security/pam_usb.nix                           | 2 --
 nixos/modules/services/hardware/udev.nix                     | 2 --
 nixos/modules/services/monitoring/uptime.nix                 | 2 +-
 nixos/modules/services/network-filesystems/openafs/lib.nix   | 2 +-
 .../modules/services/network-filesystems/openafs/server.nix  | 2 +-
 nixos/modules/services/networking/chrony.nix                 | 2 --
 nixos/modules/services/system/kerberos.nix                   | 2 +-
 nixos/modules/services/system/nscd.nix                       | 2 --
 nixos/modules/services/ttys/kmscon.nix                       | 2 +-
 nixos/modules/services/x11/desktop-managers/plasma5.nix      | 2 +-
 .../services/x11/display-managers/lightdm-greeters/gtk.nix   | 2 +-
 nixos/modules/services/x11/display-managers/lightdm.nix      | 2 +-
 nixos/modules/services/x11/window-managers/openbox.nix       | 1 -
 nixos/modules/services/x11/window-managers/wmii.nix          | 1 -
 pkgs/applications/audio/sonata/default.nix                   | 2 +-
 pkgs/applications/networking/browsers/chromium/default.nix   | 2 --
 .../networking/instant-messengers/zoom-us/default.nix        | 3 +--
 pkgs/applications/networking/irc/weechat/default.nix         | 2 +-
 pkgs/applications/science/logic/acgtk/default.nix            | 3 +--
 pkgs/applications/science/math/sage/default.nix              | 2 +-
 .../version-management/git-and-tools/git-cola/default.nix    | 2 +-
 pkgs/build-support/build-maven.nix                           | 2 +-
 pkgs/development/beam-modules/default.nix                    | 2 +-
 pkgs/development/beam-modules/lib.nix                        | 2 --
 pkgs/development/compilers/go/1.10.nix                       | 2 +-
 pkgs/development/compilers/go/1.9.nix                        | 2 +-
 pkgs/development/compilers/ocaml/ber-metaocaml-104.nix       | 2 +-
 pkgs/development/compilers/rust/binaryBuild.nix              | 3 +--
 pkgs/development/haskell-modules/default.nix                 | 2 +-
 pkgs/development/haskell-modules/hoogle.nix                  | 1 -
 pkgs/development/libraries/blitz/default.nix                 | 2 +-
 pkgs/development/libraries/ffmpeg/generic.nix                | 2 +-
 pkgs/development/libraries/freetype/default.nix              | 2 +-
 pkgs/development/libraries/gstreamer/good/default.nix        | 2 +-
 pkgs/development/libraries/libav/default.nix                 | 2 +-
 pkgs/development/libraries/libgsf/default.nix                | 2 --
 pkgs/development/libraries/libvpx/default.nix                | 2 +-
 pkgs/development/libraries/opendbx/default.nix               | 3 ---
 .../development/libraries/science/math/liblapack/default.nix | 3 +--
 pkgs/development/python-modules/pandas/0.17.1.nix            | 2 +-
 pkgs/development/python-modules/pandas/default.nix           | 2 +-
 pkgs/development/tools/misc/binutils/default.nix             | 2 +-
 pkgs/development/tools/misc/gdbgui/requirements.nix          | 2 +-
 pkgs/development/tools/xcbuild/wrapper.nix                   | 2 --
 pkgs/misc/vim-plugins/default.nix                            | 3 +--
 pkgs/misc/vscode-extensions/default.nix                      | 3 +--
 pkgs/servers/coturn/default.nix                              | 2 --
 pkgs/servers/dns/knot-resolver/default.nix                   | 2 +-
 pkgs/stdenv/native/default.nix                               | 2 +-
 pkgs/tools/X11/xpra/default.nix                              | 2 +-
 pkgs/tools/filesystems/sshfs-fuse/default.nix                | 4 +---
 pkgs/tools/graphics/graphviz/base.nix                        | 2 +-
 pkgs/tools/misc/findutils/default.nix                        | 2 --
 pkgs/tools/networking/spoofer/default.nix                    | 2 +-
 pkgs/tools/system/ddrescue/default.nix                       | 2 --
 60 files changed, 45 insertions(+), 86 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index dca39cf79ff..0066fba362a 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -3,9 +3,9 @@
 
 let
   inherit (builtins) head tail length;
-  inherit (lib.trivial) and or;
+  inherit (lib.trivial) and;
   inherit (lib.strings) concatStringsSep;
-  inherit (lib.lists) fold concatMap concatLists all deepSeqList;
+  inherit (lib.lists) fold concatMap concatLists;
 in
 
 rec {
diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix
index 5e55ac023f1..cb1fdc121e1 100644
--- a/lib/composable-derivation.nix
+++ b/lib/composable-derivation.nix
@@ -1,5 +1,5 @@
 {lib, pkgs}:
-let inherit (lib) nv nvs; in
+let inherit (lib) nvs; in
 {
 
   # composableDerivation basically mixes these features:
diff --git a/lib/customisation.nix b/lib/customisation.nix
index d942f54ee79..48028042890 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -1,9 +1,4 @@
 { lib }:
-let
-
-  inherit (builtins) attrNames;
-
-in
 
 rec {
 
diff --git a/lib/types.nix b/lib/types.nix
index 98eff2ac6ff..4d6ac51c898 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -8,7 +8,7 @@ with lib.trivial;
 with lib.strings;
 let
 
-  inherit (lib.modules) mergeDefinitions filterOverrides;
+  inherit (lib.modules) mergeDefinitions;
   outer_types =
 rec {
   isType = type: x: (x._type or "") == type;
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index 4a60403a282..3d5a37274ae 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  inherit (lib) mkOption mkEnableOption mkIf mkMerge types;
+  inherit (lib) mkOption mkIf types;
 
   cfg = config.programs.tmux;
 
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 9bc73bf0b85..c695ba075ca 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -4,8 +4,6 @@ with lib;
 
 let
 
-  inherit (pkgs) pam_usb;
-
   cfg = config.security.pam.usb;
 
   anyUsbAuth = any (attrByPath ["usbAuth"] false) (attrValues config.security.pam.services);
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 7bfc3bb6487..0266286aaac 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -4,8 +4,6 @@ with lib;
 
 let
 
-  inherit (pkgs) stdenv writeText procps;
-
   udev = config.systemd.package;
 
   cfg = config.services.udev;
diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix
index 29616a085c8..b4d3a264010 100644
--- a/nixos/modules/services/monitoring/uptime.nix
+++ b/nixos/modules/services/monitoring/uptime.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional;
+  inherit (lib) mkOption mkEnableOption mkIf mkMerge types optional;
 
   cfg = config.services.uptime;
 
diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix
index 255740ac65e..cc68eea91f2 100644
--- a/nixos/modules/services/network-filesystems/openafs/lib.nix
+++ b/nixos/modules/services/network-filesystems/openafs/lib.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ...}:
 
 let
-  inherit (lib) concatStringsSep getBin mkOption types;
+  inherit (lib) concatStringsSep mkOption types;
 
 in rec {
 
diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix
index aa8640fd240..4c80ed0839f 100644
--- a/nixos/modules/services/network-filesystems/openafs/server.nix
+++ b/nixos/modules/services/network-filesystems/openafs/server.nix
@@ -4,7 +4,7 @@
 with import ./lib.nix { inherit config lib pkgs; };
 
 let
-  inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types;
+  inherit (lib) concatStringsSep mkIf mkOption optionalString types;
 
   bosConfig = pkgs.writeText "BosConfig" (''
     restrictmode 1
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index 6a89002b42d..cef30661cc3 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -4,8 +4,6 @@ with lib;
 
 let
 
-  inherit (pkgs) chrony;
-
   stateDir = "/var/lib/chrony";
 
   keyFile = "/etc/chrony.keys";
diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index d85dee08982..d151385d2f9 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -2,7 +2,7 @@
 
 let
 
-  inherit (lib) mkOption mkIf singleton;
+  inherit (lib) mkOption mkIf;
 
   inherit (pkgs) heimdalFull;
 
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index 11a30ea81ba..fd1570d1198 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -7,8 +7,6 @@ let
   nssModulesPath = config.system.nssModules.path;
   cfg = config.services.nscd;
 
-  inherit (lib) singleton;
-
 in
 
 {
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 88e488425bc..59c45fcb44e 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let
-  inherit (lib) mkOption types mkIf optionalString;
+  inherit (lib) mkOption types mkIf;
 
   cfg = config.services.kmscon;
 
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 4b9e561d53c..17733aa7e4f 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -7,7 +7,7 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.plasma5;
 
-  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
+  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5;
 
 in
 
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index 2a71d233860..385f20b7e06 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -8,7 +8,7 @@ let
   ldmcfg = dmcfg.lightdm;
   cfg = ldmcfg.greeters.gtk;
 
-  inherit (pkgs) stdenv lightdm writeScript writeText;
+  inherit (pkgs) writeText;
 
   theme = cfg.theme.package;
   icons = cfg.iconTheme.package;
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 206ede227ef..54d4520a0c8 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -13,7 +13,7 @@ let
   wmDefault = xcfg.windowManager.default;
   hasDefaultUserSession = dmDefault != "none" || wmDefault != "none";
 
-  inherit (pkgs) stdenv lightdm writeScript writeText;
+  inherit (pkgs) lightdm writeScript writeText;
 
   # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup
   xserverWrapper = writeScript "xserver-wrapper"
diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix
index 07ef77151e9..165772d1aa0 100644
--- a/nixos/modules/services/x11/window-managers/openbox.nix
+++ b/nixos/modules/services/x11/window-managers/openbox.nix
@@ -2,7 +2,6 @@
 
 with lib;
 let
-  inherit (lib) mkOption mkIf;
   cfg = config.services.xserver.windowManager.openbox;
 in
 
diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix
index 30c8df78224..eec6f2b2b81 100644
--- a/nixos/modules/services/x11/window-managers/wmii.nix
+++ b/nixos/modules/services/x11/window-managers/wmii.nix
@@ -2,7 +2,6 @@
 
 with lib;
 let
-  inherit (lib) mkOption mkIf singleton;
   cfg = config.services.xserver.windowManager.wmii;
   wmii = pkgs.wmii_hg;
 in
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index a3d418cd4fe..8c5bab40b45 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -2,7 +2,7 @@
 , python3Packages, gnome3, gtk3, gobjectIntrospection}:
 
 let
-  inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2;
+  inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
 in buildPythonApplication rec {
   pname = "sonata";
   version = "1.7b1";
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d2bb0425170..51618a479d4 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -64,8 +64,6 @@ let
 
   version = chromium.browser.version;
 
-  inherit (stdenv.lib) versionAtLeast;
-
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${version}";
   inherit version;
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 196cbb70b4e..72812563b09 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -11,8 +11,7 @@
 assert pulseaudioSupport -> libpulseaudio != null;
 
 let
-  inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath
-    makeSearchPath optional optionalString;
+  inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
   version = "2.2.128200.0702";
   srcs = {
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index a672fa73c4f..89b9893085c 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -15,7 +15,7 @@
 , runCommand }:
 
 let
-  inherit (pythonPackages) python pycrypto pync;
+  inherit (pythonPackages) python;
   plugins = [
     { name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
     { name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index 9e6243c5498..b787a4e7a01 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -4,8 +4,7 @@
   installExamples ? true,
   installEmacsMode ? true }:
 
-let inherit (stdenv.lib) versionAtLeast
-                         optionals optionalString; in
+let inherit (stdenv.lib) versionAtLeast optionalString; in
 
 let inherit (ocamlPackages) ocaml camlp4; in
 
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 1f540cc2b28..63b751b814e 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  inherit (nixpkgs) fetchpatch fetchurl symlinkJoin fetchFromGitHub callPackage nodePackages_8_x;
+  inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x;
 
   # https://trac.sagemath.org/ticket/15980 for tracking of python3 support
   python = nixpkgs.python2.override {
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 391ca26de25..860b7b7dd0c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:
 
 let
-  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
+  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
 in buildPythonApplication rec {
   name = "git-cola-${version}";
   version = "3.1";
diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index ba85428ba8c..30df3e8e733 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -17,7 +17,7 @@ infoFile: let
     ${lib.concatStrings (map (dep: let
       inherit (dep)
         url sha1 groupId artifactId version
-        authenticated metadata extension repository-id;
+        authenticated metadata repository-id;
 
       versionDir = dep.unresolved-version or version;
 
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 83de6f9e569..f10c8ec86ff 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgs, erlang }:
 
 let
-  inherit (stdenv.lib) getVersion versionAtLeast makeExtensible;
+  inherit (stdenv.lib) makeExtensible;
 
   lib = pkgs.callPackage ./lib.nix {};
 
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index d6b83cb1af0..db40c47794f 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -49,7 +49,6 @@ rec {
   */
   callElixir = drv: args:
     let
-      inherit (stdenv.lib) versionAtLeast;
       builder = callPackage ../interpreters/elixir/generic-builder.nix args;
     in
       callPackage drv {
@@ -71,7 +70,6 @@ rec {
   */
   callLFE = drv: args:
     let
-      inherit (stdenv.lib) versionAtLeast;
       builder = callPackage ../interpreters/lfe/generic-builder.nix args;
     in
       callPackage drv {
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index b4fa005c3de..0958bdeb0c1 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -6,7 +6,7 @@
 
 let
 
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
 
   clangHack = writeScriptBin "clang" ''
     #!${stdenv.shell}
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 8ef528e2c92..6acedecb211 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -6,7 +6,7 @@
 
 let
 
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
 
   clangHack = writeScriptBin "clang" ''
     #!${stdenv.shell}
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
index e084a2dcf94..e6c68894036 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
@@ -2,7 +2,7 @@
 
 let
    useX11 = stdenv.isi686 || stdenv.isx86_64;
-   inherit (stdenv.lib) optionals optionalString;
+   inherit (stdenv.lib) optionals;
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
index 4c3c5d008f0..dbfc14e30ef 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -6,8 +6,7 @@
 }:
 
 let
-  inherit (stdenv.lib) getLib optionalString;
-  inherit (darwin) libiconv;
+  inherit (stdenv.lib) optionalString;
   inherit (darwin.apple_sdk.frameworks) Security;
 
   bootstrapping = versionType == "bootstrap";
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 7b512e46da8..b8943a55394 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -11,7 +11,7 @@
 let
 
   inherit (lib) extends makeExtensible;
-  inherit (haskellLib) overrideCabal makePackageSet;
+  inherit (haskellLib) makePackageSet;
 
   haskellPackages = pkgs.callPackage makePackageSet {
     package-set = initialPackages;
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 7b3fe8fba02..c7fbab6ab88 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -28,7 +28,6 @@
 }:
 
 let
-  inherit (stdenv.lib) optional;
   wrapper = ./hoogle-local-wrapper.sh;
   isGhcjs = ghc.isGhcjs or false;
   opts = lib.optionalString;
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index 5ae9ead9ced..503e4b0fa43 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -19,7 +19,7 @@
 assert enableSerialization -> boost != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optional optionals;
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 3d9027db160..e763e5c1159 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -42,7 +42,7 @@
  */
 
 let
-  inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32;
+  inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32;
   inherit (stdenv.lib) optional optionals enableFeature;
 
   cmpVer = builtins.compareVersions;
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 23aa86af377..dbfb18a22ed 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optional optionalString;
 
 in stdenv.mkDerivation rec {
   name = "freetype-${version}";
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 11e0894df3c..ad7309be044 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -12,7 +12,7 @@
 assert gtkSupport -> gtk3 != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
   name = "gst-plugins-good-1.14.0";
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index dfe1455759a..5eb90aaf05c 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -18,7 +18,7 @@
 
 assert faacSupport -> enableUnfree;
 
-let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in
+let inherit (stdenv.lib) optional hasPrefix enableFeature; in
 
 /* ToDo:
     - more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index b0013d0f949..90daf2ddf74 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,8 +1,6 @@
 { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
 , python, perl, gdk_pixbuf, libiconv, libintl }:
 
-let inherit (stdenv.lib) optionals; in
-
 stdenv.mkDerivation rec {
   name = "libgsf-1.14.42";
 
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 731892d33b4..7e3780603f7 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -41,7 +41,7 @@
 }:
 
 let
-  inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
+  inherit (stdenv) is64bit isMips isDarwin isCygwin;
   inherit (stdenv.lib) enableFeature optional optionals;
 in
 
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index 20a62ef67f9..a073a29b507 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -1,8 +1,5 @@
 { stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
 
-let
-  inherit (stdenv.lib) getDev getLib;
-in
 stdenv.mkDerivation rec {
   name = "opendbx-1.4.6";
 
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index c68454fbe4a..e6af2251b1f 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -11,8 +11,7 @@ let
   atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
                      else null;
   usedLibExtension = if shared then ".so" else ".a";
-  inherit (stdenv.lib) optional optionals concatStringsSep;
-  inherit (builtins) hasAttr attrNames;
+  inherit (stdenv.lib) optional optionals;
   version = "3.8.0";
 in
 
diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix
index 2c0a2c44f6e..cab93429b57 100644
--- a/pkgs/development/python-modules/pandas/0.17.1.nix
+++ b/pkgs/development/python-modules/pandas/0.17.1.nix
@@ -23,7 +23,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionalString concatStringsSep;
+  inherit (stdenv.lib) optional optionalString;
   inherit (stdenv) isDarwin;
 in buildPythonPackage rec {
   pname = "pandas";
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 08fdddb7346..03be247ab47 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -24,7 +24,7 @@
 }:
 
 let
-  inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
+  inherit (stdenv.lib) optional optionals optionalString;
   inherit (stdenv) isDarwin;
 
 in buildPythonPackage rec {
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 0b71c6719dc..be5dfa945c0 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -10,7 +10,7 @@ let
   # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3
   version = "2.30";
   basename = "binutils-${version}";
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
   # The targetPrefix prepended to binary names to allow multiple binuntils on the
   # PATH to both be usable.
   targetPrefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
diff --git a/pkgs/development/tools/misc/gdbgui/requirements.nix b/pkgs/development/tools/misc/gdbgui/requirements.nix
index 13978645c29..273f9db0c39 100644
--- a/pkgs/development/tools/misc/gdbgui/requirements.nix
+++ b/pkgs/development/tools/misc/gdbgui/requirements.nix
@@ -11,7 +11,7 @@
 let
 
   inherit (pkgs) makeWrapper;
-  inherit (pkgs.stdenv.lib) fix' extends inNixShell;
+  inherit (pkgs.stdenv.lib) fix' extends;
 
   pythonPackages =
   import "${toString pkgs.path}/pkgs/top-level/python-packages.nix" {
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index f8b1c1bf31e..8f71e995183 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -7,8 +7,6 @@
 
 let
 
-  inherit (lib) toLower;
-
   toolchainName = "com.apple.dt.toolchain.XcodeDefault";
   sdkName = "${xcodePlatform}${sdkVer}";
 
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8428a3b7894..3e662d33f42 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -14,8 +14,7 @@ let
 
   _skim = skim;
 
-  inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin
-    buildVimPluginFrom2Nix vimHelpTags;
+  inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
 
 
 # TL;DR
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 16ddb8fd405..6b431456b35 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,8 +1,7 @@
 { stdenv, lib, fetchurl, callPackage, vscode-utils }:
 
 let
-  inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension
-      extensionFromVscodeMarketplace;
+  inherit (vscode-utils) buildVscodeMarketplaceExtension;
 in
 #
 # Unless there is a good reason not to, we attemp to use the same name as the 
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index f83ef4cef38..0891b72cd1e 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchFromGitHub, openssl, libevent }:
 
-let inherit (stdenv.lib) optional; in
-
 stdenv.mkDerivation rec {
   name = "coturn-${version}";
   version = "4.5.0.7";
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index bfa610b57d8..b9c2faeae6e 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -8,7 +8,7 @@ let # un-indented, over the whole file
 
 result = if extraFeatures then wrapped-full else unwrapped;
 
-inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
+inherit (stdenv.lib) optional concatStringsSep;
 
 unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 78f7a82d295..37795b11f6d 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -5,7 +5,7 @@
 assert crossSystem == null;
 
 let
-  inherit (localSystem) system platform;
+  inherit (localSystem) system;
 
   shell =
     if system == "i686-freebsd" || system == "x86_64-freebsd" then "/usr/local/bin/bash"
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 8bff5a2e714..9bc2a978e0e 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -9,7 +9,7 @@
 with lib;
 
 let
-  inherit (python2Packages) python cython buildPythonApplication;
+  inherit (python2Packages) cython buildPythonApplication;
 in buildPythonApplication rec {
   name = "xpra-${version}";
   version = "2.3.2";
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index e9325e9b18d..6d95d5ee12b 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -2,9 +2,7 @@
 , docutils
 }:
 
-let
-  inherit (stdenv.lib) optional;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "3.4.0";
   name = "sshfs-fuse-${version}";
 
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index 2fa4bb90a8e..68ff84c7495 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -7,7 +7,7 @@
 assert stdenv.isDarwin -> ApplicationServices != null;
 
 let
-  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv.lib) optionals optionalString;
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index f79720289bf..66b7ef4c291 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -3,8 +3,6 @@
 , buildPlatform, hostPlatform
 }:
 
-let inherit (stdenv.lib) optionals; in
-
 stdenv.mkDerivation rec {
   name = "findutils-4.6.0";
 
diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
index 675777e4faa..acda30dbfef 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, protobuf, openssl, libpcap, traceroute
 , withGUI ? false, qt5 }:
 
-let inherit (stdenv.lib) optional optionalString;
+let inherit (stdenv.lib) optional;
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index fc42c3b856f..91489388eec 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -3,8 +3,6 @@
 , hostPlatform, buildPlatform
 }:
 
-let inherit (stdenv.lib) optionals; in
-
 stdenv.mkDerivation rec {
   name = "ddrescue-1.23";
 
-- 
GitLab


From 88cdecf34cbcd87b9435098edf4f23797280bb66 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Fri, 20 Jul 2018 22:40:58 +0300
Subject: [PATCH 086/128] elvish: 0.11 -> 0.12

---
 pkgs/shells/elvish/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 086fca480bb..dc7133e988f 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "elvish-${version}";
-  version = "0.11";
+  version = "0.12";
 
   goPackagePath = "github.com/elves/elvish";
+  excludedPackages = [ "website" ];
 
   src = fetchFromGitHub {
     repo = "elvish";
     owner = "elves";
     rev = version;
-    sha256 = "1rzgy1ql381nwsdjgiwv4mdr1xwivnpmzgkdzms8ipn2lbwhff87";
+    sha256 = "1vvbgkpnrnb5aaak4ks45wl0cyp0vbry8bpxl6v2dpmq9x0bscpp";
   };
 
   meta = with stdenv.lib; {
     description = "A friendly and expressive Unix shell";
-    homepage = https://github.com/elves/elvish;
+    homepage = https://elv.sh/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ vrthra ];
     platforms = with platforms; linux ++ darwin;
-- 
GitLab


From dda95bae353e8c78faa921dbf25347b11060b383 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 20 Jul 2018 19:54:05 +0000
Subject: [PATCH 087/128] [bot] treewide: remove unused 'args@' in lambdas

---
 nixos/modules/services/misc/leaps.nix                         | 2 +-
 pkgs/applications/editors/jetbrains/common.nix                | 2 +-
 pkgs/applications/networking/bittorrentsync/generic.nix       | 2 +-
 pkgs/data/misc/nixos-artwork/wallpapers.nix                   | 2 +-
 pkgs/development/compilers/rust/rustc.nix                     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/alexandria.nix       | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/array-utils.nix      | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix  | 2 +-
 .../quicklisp-to-nix-output/asdf-system-connections.nix       | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/chipz.nix            | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-aa.nix            | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix       | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix    | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-log.nix           | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-markup.nix        | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-paths.nix         | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-unification.nix   | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/cl-utilities.nix     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/clack-socket.nix     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/closer-mop.nix       | 2 +-
 .../quicklisp-to-nix-output/command-line-arguments.nix        | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/css-lite.nix         | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/garbage-pools.nix    | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/iterate.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/kmrcl.nix            | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/lack-component.nix   | 2 +-
 .../development/lisp-modules/quicklisp-to-nix-output/lift.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/map-set.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/marshal.nix          | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/metabang-bind.nix    | 2 +-
 .../quicklisp-to-nix-output/metatilities-base.nix             | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/misc-extensions.nix  | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/mt19937.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/named-readtables.nix | 2 +-
 .../net_dot_didierverna_dot_asdf-flv.nix                      | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/parse-number.nix     | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/plump-lexer.nix      | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/ptester.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/rfc2388.nix          | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix  | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/salza2.nix           | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/string-case.nix      | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/swank.nix            | 2 +-
 .../quicklisp-to-nix-output/trivial-backtrace.nix             | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-features.nix | 2 +-
 .../quicklisp-to-nix-output/trivial-gray-streams.nix          | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-indent.nix   | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix    | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-types.nix    | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix    | 2 +-
 .../development/lisp-modules/quicklisp-to-nix-output/uffi.nix | 2 +-
 .../development/lisp-modules/quicklisp-to-nix-output/uiop.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/unit-test.nix        | 2 +-
 pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/xsubseq.nix          | 2 +-
 .../development/lisp-modules/quicklisp-to-nix-output/yacc.nix | 2 +-
 .../lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix          | 2 +-
 pkgs/development/node-packages/node-env.nix                   | 4 ++--
 pkgs/development/pharo/vm/default.nix                         | 2 +-
 pkgs/development/ruby-modules/bundled-common/default.nix      | 2 +-
 pkgs/development/ruby-modules/bundled-common/functions.nix    | 4 ++--
 pkgs/development/ruby-modules/bundled-common/test.nix         | 2 +-
 pkgs/development/ruby-modules/bundler-env/test.nix            | 2 +-
 pkgs/os-specific/linux/kernel/generic.nix                     | 2 +-
 pkgs/os-specific/linux/spl/default.nix                        | 2 +-
 pkgs/os-specific/linux/zfs/default.nix                        | 2 +-
 pkgs/servers/http/tomcat/default.nix                          | 2 +-
 pkgs/servers/owncloud/default.nix                             | 2 +-
 pkgs/servers/sql/postgresql/default.nix                       | 2 +-
 pkgs/top-level/emacs-packages.nix                             | 2 +-
 74 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix
index b92cf27f58d..d4e88ecbebd 100644
--- a/nixos/modules/services/misc/leaps.nix
+++ b/nixos/modules/services/misc/leaps.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... } @ args:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 7715de15398..caf334b3ee4 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -2,7 +2,7 @@
 , coreutils, gnugrep, which, git, python, unzip, libsecret
 }:
 
-{ name, product, version, src, wmClass, jdk, meta } @ attrs:
+{ name, product, version, src, wmClass, jdk, meta }:
 
 with stdenv.lib;
 
diff --git a/pkgs/applications/networking/bittorrentsync/generic.nix b/pkgs/applications/networking/bittorrentsync/generic.nix
index eb988471c8c..dae540ba426 100644
--- a/pkgs/applications/networking/bittorrentsync/generic.nix
+++ b/pkgs/applications/networking/bittorrentsync/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, version, sha256s, ... } @ args:
+{ stdenv, fetchurl, version, sha256s, ... }:
 
 let
   arch = {
diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix
index 2eebe61b142..3a65a9626d1 100644
--- a/pkgs/data/misc/nixos-artwork/wallpapers.nix
+++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 let
-  mkNixBackground = { name, src, description } @ attrs:
+  mkNixBackground = { name, src, description }:
 
     stdenv.mkDerivation {
       inherit name src;
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index b0dae9d2042..f3f9e2f57b7 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -13,7 +13,7 @@
 , doCheck ? true
 , broken ? false
 , buildPlatform, hostPlatform
-} @ args:
+}:
 
 let
   inherit (stdenv.lib) optional optionalString;
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 9b9486e9758..22aa818f875 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''alexandria'';
   version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 7c618a9fffb..c90a9e09192 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''array-utils'';
   version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
index f2125676e5a..68c8a7e087b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''asdf-finalizers'';
   version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 65df45d95a5..4612e6175b9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''asdf-system-connections'';
   version = ''20170124-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index a9808173b62..c8f34e0fa17 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''chipz'';
   version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 531d429df24..a420c22054f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-aa'';
   version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index a413743eb8d..42a7bd59585 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-anonfun'';
   version = ''20111203-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 61a35f2b58c..0321572e72a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-html-parse'';
   version = ''20161031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index dfabda0428f..825fea4eb90 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-l10n-cldr'';
   version = ''20120909-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
index 57c9c03ba42..d506acf876e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-log'';
   version = ''cl-log.1.0.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 8967b0970c5..67468edbb6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-markup'';
   version = ''20131003-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index e8034b11c23..f546e4711ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-paths'';
   version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 6d284b7b012..4434e711d9d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-unification'';
   version = ''20171227-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 750da99d5d6..1b78d0d2898 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''cl-utilities'';
   version = ''1.2.4'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index fe511ec40bd..a4a66ecfa64 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''clack-socket'';
   version = ''clack-20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index 312d0eb10a4..ec7599f2bd3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
   version = ''20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index e1fb5965852..1ae6fa0f4ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''command-line-arguments'';
   version = ''20151218-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index f4941aa80cd..bb5ab940638 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''css-lite'';
   version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
index ae8ed6de877..7c69878900c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''db3'';
   version = ''cl-20150302-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
index 1568533d92a..91b8db69a36 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''eos'';
   version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
index 11d5ac4491e..76e2a55620c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''garbage-pools'';
   version = ''20130720-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index f276ec72736..f85b128652d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''iterate'';
   version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index e5cbad3e9e8..62a3ae2bb7d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''kmrcl'';
   version = ''20150923-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 4dfdce68bc8..79f2d38ef10 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''lack-component'';
   version = ''lack-20180430-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index a3ddc2fd953..b44c0c8a987 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''lift'';
   version = ''20151031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index db25e6ae534..006361ed80c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''map-set'';
   version = ''20160628-hg'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index 4f6842606b4..c34d79f3d13 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''marshal'';
   version = ''cl-20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 953dd0a58a4..c65d95d9ef7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''md5'';
   version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index d72e0839d1e..5647b9a9270 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''metabang-bind'';
   version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
index 1fc10b9c8db..6bbdf5f911e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''metatilities-base'';
   version = ''20170403-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 6334804c4f7..3c289fefa9a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''misc-extensions'';
   version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index a8cfc070bf9..29460307e69 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''mt19937'';
   version = ''1.1.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index 82d06b1c93b..e1d6a1477a7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''named-readtables'';
   version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 4e7c84566a0..67636d3f6cf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''net_dot_didierverna_dot_asdf-flv'';
   version = ''asdf-flv-version-2.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index e636df0805e..5c1f90220eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''parse-number'';
   version = ''v1.7'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
index 5edceaf4ad9..cd0db041c5b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''plump-lexer'';
   version = ''plump-20170725-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index ffa2e595c26..c90b252313b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''ptester'';
   version = ''20160929-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index be2897d19a4..41ead034791 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''rfc2388'';
   version = ''20130720-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index d5be4be7daf..8ed7c1a4499 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''rt'';
   version = ''20101006-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 9056cfbdcca..d55f7700092 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''salza2'';
   version = ''2.0.9'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 7f5cc1e048d..9cc6338c8b8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''string-case'';
   version = ''20151218-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 1359e13b949..6819e4b2571 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''swank'';
   version = ''slime-v2.20'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index 9a4afce3280..a772694b983 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-backtrace'';
   version = ''20160531-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 1a562c2288b..5efc5766955 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-features'';
   version = ''20161204-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index dd93a599d69..9a285fea2f1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-gray-streams'';
   version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 4f4e1f81223..e044f097701 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
   version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index 56bbb583837..6946141f112 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-mimes'';
   version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 8cc04c2c64a..1af66736f30 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-types'';
   version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index c925382d81d..753f21dbcb9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''trivial-utf-8'';
   version = ''20111001-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 1986f7c88f7..0ac190993d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''uffi'';
   version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 39c2060af02..afb8b388568 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''uiop'';
   version = ''3.3.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 6c456496732..3a4b05e0526 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''unit-test'';
   version = ''20120520-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 6a4751f799e..11b9351c03a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''vom'';
   version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index b9ab71744c3..c70c3f2e1e1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''xsubseq'';
   version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index c7031f4aa3f..733185e2b26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''yacc'';
   version = ''cl-20101006-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 74e5d7e97e9..090aa670ad9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, ... }:
+{ fetchurl, ... }:
 rec {
   baseName = ''zpb-ttf'';
   version = ''1.0.3'';
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 720e0cc0850..eee72cb9613 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -56,7 +56,7 @@ let
       ) dependencies);
 
   # Recursively composes the dependencies of a package
-  composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+  composePackage = { name, packageName, src, dependencies ? [], ... }:
     ''
       DIR=$(pwd)
       cd $TMPDIR
@@ -176,7 +176,7 @@ let
   # dependencies in the package.json file to the versions that are actually
   # being used.
 
-  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }:
     ''
       if [ -d "${packageName}" ]
       then
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index b995e0e2540..5178551df45 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...} @pkgs:
+{ stdenv, callPackage, pkgsi686Linux, makeWrapper, ...}:
 
 let
   i686    = pkgsi686Linux.callPackage ./vms.nix {};
diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 16f1abe1a89..f902ca58c38 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -61,7 +61,7 @@ let
   else
     name;
 
-  copyIfBundledByPath = { bundledByPath ? false, ...}@main:
+  copyIfBundledByPath = { bundledByPath ? false, ...}:
   (if bundledByPath then
       assert gemFiles.gemdir != null; "cp -a ${gemFiles.gemdir}/* $out/" #*/
     else ""
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix
index 85e93959e4b..b8e666a92f9 100644
--- a/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -22,9 +22,9 @@ rec {
     else gemset;
   };
 
-  filterGemset = {ruby, groups,...}@env: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
+  filterGemset = {ruby, groups,...}: gemset: lib.filterAttrs (name: attrs: platformMatches ruby attrs && groupMatches groups attrs) gemset;
 
-  platformMatches = {rubyEngine, version, ...}@ruby: attrs: (
+  platformMatches = {rubyEngine, version, ...}: attrs: (
   !(attrs ? "platforms") ||
   builtins.length attrs.platforms == 0 ||
     builtins.any (platform:
diff --git a/pkgs/development/ruby-modules/bundled-common/test.nix b/pkgs/development/ruby-modules/bundled-common/test.nix
index ee3754595f3..7c5932c4e76 100644
--- a/pkgs/development/ruby-modules/bundled-common/test.nix
+++ b/pkgs/development/ruby-modules/bundled-common/test.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }@defs:
+{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }:
 let
   testConfigs = {
     inherit lib;
diff --git a/pkgs/development/ruby-modules/bundler-env/test.nix b/pkgs/development/ruby-modules/bundler-env/test.nix
index 63da7044c0c..e42f1bf2571 100644
--- a/pkgs/development/ruby-modules/bundler-env/test.nix
+++ b/pkgs/development/ruby-modules/bundler-env/test.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}@defs:
+{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}:
 let
   bundlerEnv = callPackage ./default.nix stubs // {
     basicEnv = callPackage ../bundled-common stubs;
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 684955b9067..25078b7d753 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -47,7 +47,7 @@
 
 , mkValueOverride ? null
 , ...
-} @ args:
+}:
 
 assert stdenv.isLinux;
 
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index af3df245fe6..880da81c42e 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -12,7 +12,7 @@ let
     , rev ? "spl-${version}"
     , broken ? false
     , patches ? []
-    } @ args : stdenv.mkDerivation rec {
+    }: stdenv.mkDerivation rec {
       name = "spl-${version}-${kernel.version}";
 
       src = fetchFromGitHub {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 6eac54ddf65..45edf8945c0 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -24,7 +24,7 @@ let
     , rev ? "zfs-${version}"
     , isUnstable ? false
     , isLegacyCrypto ? false
-    , incompatibleKernelVersion ? null } @ args:
+    , incompatibleKernelVersion ? null }:
     if buildKernel &&
       (incompatibleKernelVersion != null) &&
         versionAtLeast kernel.version incompatibleKernelVersion then
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 098825d59ce..8fe34cd6183 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  common = { versionMajor, versionMinor, sha256 } @ args: stdenv.mkDerivation (rec {
+  common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec {
     name = "apache-tomcat-${version}";
     version = "${versionMajor}.${versionMinor}";
 
diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix
index f02e67740b6..14a4a2868f0 100644
--- a/pkgs/servers/owncloud/default.nix
+++ b/pkgs/servers/owncloud/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 let
-  common = { versiona, sha256 } @ args: stdenv.mkDerivation (rec {
+  common = { versiona, sha256 }: stdenv.mkDerivation (rec {
 
     name= "owncloud-${version}";
     version= versiona;
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index c8b007b36ac..a727b60dd9d 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  common = { version, sha256, psqlSchema } @ args:
+  common = { version, sha256, psqlSchema }:
    let atLeast = lib.versionAtLeast version; in stdenv.mkDerivation (rec {
     name = "postgresql-${version}";
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f6c992d5bd5..770e45a5d62 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -39,7 +39,7 @@
 , melpaBuild
 
 , external
-}@args:
+}:
 
 with lib.licenses;
 
-- 
GitLab


From 70328c3ce99132e5ed2324eca5f11b61d9b0e39f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 22:38:08 +0200
Subject: [PATCH 088/128] calibre: 3.27.1 -> 3.28.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 1aabbb587eb..fef98529ddf 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.27.1";
+  version = "3.28.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0hmdlnwrfql2b675xmjf50hnnrrkv5jbky0ssdpyfjfa5vxya2bh";
+    sha256 = "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414";
   };
 
   patches = [
-- 
GitLab


From ba893d4e49735a9382e32c763ec72b9e71da1877 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 22:50:48 +0200
Subject: [PATCH 089/128] bazel-buildtools: add version to name

see issue #43717
---
 .../tools/build-managers/bazel/buildtools/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index a98c2b4e04b..52fec3f131b 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "bazel-buildtools";
+  name = "bazel-buildtools-unstable-${version}";
   version = "2018-05-24";
 
   goPackagePath = "github.com/bazelbuild/buildtools";
-- 
GitLab


From 4d1fd3775d33d5d46a8d691c4e12c7eef8fcefbd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 22:53:05 +0200
Subject: [PATCH 090/128] buck: adhere to version schema convention

see issue #43717
---
 pkgs/development/tools/build-managers/buck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index 5d486f47844..9fdecaabfd8 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "buck-${version}";
-  version = "v2017.10.01.01";
+  name = "buck-unstable-${version}";
+  version = "2017-10-01";
 
   src = fetchFromGitHub {
     owner = "facebook";
-- 
GitLab


From 2e979e8ceb45c2c251ed189c28a736fec7539c15 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 20 Jul 2018 20:56:59 +0000
Subject: [PATCH 091/128] [bot] nixos/*: remove unused arguments in lambdas

---
 nixos/lib/build-vms.nix                       |  2 +-
 nixos/lib/make-disk-image.nix                 |  3 --
 nixos/lib/make-iso9660-image.nix              |  2 +-
 nixos/lib/testing.nix                         |  2 +-
 nixos/maintainers/option-usages.nix           |  4 +-
 nixos/modules/config/no-x-libs.nix            |  2 +-
 nixos/modules/config/nsswitch.nix             |  2 +-
 nixos/modules/config/power-management.nix     |  2 +-
 nixos/modules/config/sysctl.nix               |  2 +-
 nixos/modules/config/unix-odbc-drivers.nix    |  2 +-
 nixos/modules/config/users-groups.nix         |  2 +-
 nixos/modules/config/vpnc.nix                 |  2 +-
 .../hardware/network/smc-2632w/default.nix    |  2 +-
 .../modules/hardware/network/zydas-zd1211.nix |  2 +-
 nixos/modules/hardware/video/ati.nix          |  2 +-
 .../hardware/video/capture/mwprocapture.nix   |  2 +-
 .../video/uvcvideo/uvcdynctrl-udev-rules.nix  |  4 +-
 ...stallation-cd-graphical-kde-new-kernel.nix |  2 +-
 .../installation-cd-minimal-new-kernel.nix    |  2 +-
 .../cd-dvd/installation-cd-minimal.nix        |  2 +-
 .../installer/netboot/netboot-base.nix        |  2 +-
 .../installer/netboot/netboot-minimal.nix     |  2 +-
 nixos/modules/installer/scan/detected.nix     |  2 +-
 nixos/modules/installer/tools/tools.nix       |  2 +-
 nixos/modules/installer/virtualbox-demo.nix   |  2 +-
 nixos/modules/misc/assertions.nix             |  2 +-
 nixos/modules/misc/extra-arguments.nix        |  2 +-
 nixos/modules/misc/ids.nix                    |  2 +-
 nixos/modules/misc/label.nix                  |  2 +-
 nixos/modules/misc/lib.nix                    |  2 +-
 nixos/modules/misc/locate.nix                 |  2 +-
 nixos/modules/misc/meta.nix                   |  2 +-
 nixos/modules/misc/passthru.nix               |  2 +-
 nixos/modules/profiles/all-hardware.nix       |  2 +-
 nixos/modules/profiles/base.nix               |  2 +-
 nixos/modules/profiles/demo.nix               |  2 +-
 nixos/modules/profiles/graphical.nix          |  2 +-
 nixos/modules/profiles/hardened.nix           |  2 +-
 nixos/modules/profiles/headless.nix           |  2 +-
 nixos/modules/profiles/minimal.nix            |  2 +-
 nixos/modules/profiles/qemu-guest.nix         |  2 +-
 nixos/modules/programs/atop.nix               |  2 +-
 nixos/modules/programs/bcc.nix                |  2 +-
 nixos/modules/programs/environment.nix        |  2 +-
 nixos/modules/programs/shell.nix              |  2 +-
 nixos/modules/programs/systemtap.nix          |  2 +-
 nixos/modules/security/hidepid.nix            |  2 +-
 nixos/modules/security/oath.nix               |  2 +-
 nixos/modules/services/backup/bacula.nix      |  4 +-
 nixos/modules/services/backup/borgbackup.nix  |  2 +-
 nixos/modules/services/backup/restic.nix      |  2 +-
 .../continuous-integration/jenkins/slave.nix  |  2 +-
 nixos/modules/services/hardware/actkbd.nix    |  2 +-
 .../services/hardware/nvidia-optimus.nix      |  2 +-
 .../hardware/sane_extra_backends/brscan4.nix  |  2 +-
 .../modules/services/logging/journalwatch.nix |  2 +-
 nixos/modules/services/mail/dovecot.nix       |  2 +-
 nixos/modules/services/mail/mail.nix          |  2 +-
 nixos/modules/services/misc/emby.nix          |  2 +-
 nixos/modules/services/misc/jackett.nix       |  2 +-
 nixos/modules/services/misc/nix-gc.nix        |  2 +-
 nixos/modules/services/misc/nix-optimise.nix  |  2 +-
 nixos/modules/services/misc/nix-ssh-serve.nix |  2 +-
 nixos/modules/services/misc/radarr.nix        |  2 +-
 nixos/modules/services/misc/sonarr.nix        |  2 +-
 .../services/misc/taskserver/default.nix      |  2 +-
 .../monitoring/prometheus/exporters.nix       |  2 +-
 nixos/modules/services/monitoring/smartd.nix  |  2 +-
 .../services/network-filesystems/beegfs.nix   |  2 +-
 .../network-filesystems/openafs/lib.nix       |  2 +-
 .../services/networking/avahi-daemon.nix      |  2 +-
 nixos/modules/services/networking/cjdns.nix   |  2 +-
 nixos/modules/services/networking/i2pd.nix    |  4 +-
 .../networking/nghttpx/nghttpx-options.nix    |  2 +-
 nixos/modules/services/networking/nylon.nix   |  2 +-
 nixos/modules/services/networking/pptpd.nix   |  2 +-
 nixos/modules/services/networking/shout.nix   |  2 +-
 .../modules/services/networking/ssh/sshd.nix  |  2 +-
 nixos/modules/services/networking/toxvpn.nix  |  2 +-
 .../modules/services/networking/tvheadend.nix |  2 +-
 .../modules/services/networking/wireguard.nix |  2 +-
 nixos/modules/services/networking/xl2tpd.nix  |  2 +-
 nixos/modules/services/networking/zerobin.nix |  2 +-
 .../services/security/oauth2_proxy_nginx.nix  |  2 +-
 nixos/modules/services/security/tor.nix       |  4 +-
 nixos/modules/services/torrent/flexget.nix    |  2 +-
 nixos/modules/services/web-apps/matomo.nix    |  2 +-
 nixos/modules/services/web-apps/youtrack.nix  |  2 +-
 .../web-servers/apache-httpd/limesurvey.nix   |  2 +-
 .../web-servers/apache-httpd/mercurial.nix    |  2 +-
 .../web-servers/apache-httpd/wordpress.nix    |  2 +-
 .../web-servers/nginx/vhost-options.nix       |  2 +-
 nixos/modules/services/web-servers/zope2.nix  |  2 +-
 .../services/x11/display-managers/auto.nix    |  2 +-
 .../modules/services/x11/terminal-server.nix  |  2 +-
 .../services/x11/window-managers/default.nix  |  2 +-
 .../services/x11/window-managers/wmii.nix     |  2 +-
 nixos/modules/services/x11/xserver.nix        |  2 +-
 nixos/modules/system/activation/top-level.nix |  2 +-
 nixos/modules/system/boot/kexec.nix           |  2 +-
 nixos/modules/system/boot/loader/loader.nix   |  2 +-
 nixos/modules/system/boot/networkd.nix        |  2 +-
 nixos/modules/system/boot/resolved.nix        |  2 +-
 nixos/modules/system/boot/systemd.nix         |  6 +--
 nixos/modules/system/boot/timesyncd.nix       |  2 +-
 nixos/modules/tasks/bcache.nix                |  2 +-
 nixos/modules/tasks/filesystems/ext.nix       |  2 +-
 .../tasks/network-interfaces-systemd.nix      |  2 +-
 nixos/modules/tasks/network-interfaces.nix    |  2 +-
 .../tasks/scsi-link-power-management.nix      |  2 +-
 nixos/modules/tasks/swraid.nix                |  2 +-
 nixos/modules/tasks/trackpoint.nix            |  2 +-
 nixos/modules/testing/service-runner.nix      |  2 +-
 .../modules/virtualisation/amazon-options.nix |  2 +-
 nixos/modules/virtualisation/azure-common.nix |  2 +-
 .../virtualisation/azure-config-user.nix      |  2 +-
 nixos/modules/virtualisation/azure-config.nix |  2 +-
 .../virtualisation/brightbox-config.nix       |  2 +-
 nixos/modules/virtualisation/containers.nix   |  4 +-
 nixos/modules/virtualisation/docker-image.nix |  2 +-
 .../virtualisation/google-compute-config.nix  |  2 +-
 .../modules/virtualisation/lxc-container.nix  |  2 +-
 nixos/modules/virtualisation/nova-config.nix  |  2 +-
 nixos/modules/virtualisation/xen-domU.nix     |  2 +-
 nixos/release.nix                             | 30 +++++++-------
 nixos/tests/acme.nix                          |  2 +-
 nixos/tests/ammonite.nix                      |  2 +-
 nixos/tests/atd.nix                           |  4 +-
 nixos/tests/avahi.nix                         |  2 +-
 nixos/tests/beegfs.nix                        |  6 +--
 nixos/tests/bittorrent.nix                    |  8 ++--
 nixos/tests/borgbackup.nix                    |  4 +-
 nixos/tests/buildbot.nix                      |  6 +--
 nixos/tests/cadvisor.nix                      |  4 +-
 nixos/tests/cassandra.nix                     |  6 +--
 nixos/tests/ceph.nix                          |  4 +-
 nixos/tests/cjdns.nix                         |  8 ++--
 nixos/tests/cloud-init.nix                    |  2 +-
 nixos/tests/common/user-account.nix           |  2 +-
 nixos/tests/containers-bridge.nix             |  2 +-
 nixos/tests/containers-extra_veth.nix         |  2 +-
 nixos/tests/containers-hosts.nix              |  2 +-
 nixos/tests/containers-ipv4.nix               |  2 +-
 nixos/tests/containers-ipv6.nix               |  2 +-
 nixos/tests/containers-macvlans.nix           |  4 +-
 .../tests/containers-physical_interfaces.nix  |  8 ++--
 nixos/tests/containers-portforward.nix        |  2 +-
 nixos/tests/containers-reloadable.nix         |  6 +--
 nixos/tests/containers-restart_networking.nix |  8 ++--
 nixos/tests/containers-tmpfs.nix              |  2 +-
 nixos/tests/couchdb.nix                       |  4 +-
 nixos/tests/deluge.nix                        |  2 +-
 nixos/tests/dnscrypt-proxy.nix                |  2 +-
 nixos/tests/docker-edge.nix                   |  2 +-
 nixos/tests/docker-registry.nix               |  6 +--
 nixos/tests/docker-tools-overlay.nix          |  2 +-
 nixos/tests/docker-tools.nix                  |  2 +-
 nixos/tests/docker.nix                        |  2 +-
 nixos/tests/ecryptfs.nix                      |  4 +-
 nixos/tests/elk.nix                           |  2 +-
 nixos/tests/emacs-daemon.nix                  |  2 +-
 nixos/tests/env.nix                           |  2 +-
 nixos/tests/etcd-cluster.nix                  |  6 +--
 nixos/tests/etcd.nix                          |  2 +-
 nixos/tests/ferm.nix                          |  4 +-
 nixos/tests/firefox.nix                       |  2 +-
 nixos/tests/firewall.nix                      |  6 +--
 nixos/tests/flannel.nix                       |  6 +--
 nixos/tests/flatpak.nix                       |  2 +-
 nixos/tests/fwupd.nix                         |  2 +-
 nixos/tests/gitlab.nix                        |  2 +-
 nixos/tests/gitolite.nix                      |  4 +-
 nixos/tests/gnome3-gdm.nix                    |  2 +-
 nixos/tests/gnome3.nix                        |  2 +-
 nixos/tests/gocd-agent.nix                    |  2 +-
 nixos/tests/gocd-server.nix                   |  2 +-
 nixos/tests/grafana.nix                       |  2 +-
 nixos/tests/graphite.nix                      |  4 +-
 nixos/tests/hadoop/hdfs.nix                   |  6 +--
 nixos/tests/hadoop/yarn.nix                   |  6 +--
 nixos/tests/haka.nix                          |  2 +-
 nixos/tests/haproxy.nix                       |  2 +-
 nixos/tests/hardened.nix                      |  2 +-
 nixos/tests/hibernate.nix                     |  2 +-
 nixos/tests/hitch/default.nix                 |  2 +-
 nixos/tests/hocker-fetchdocker/machine.nix    |  2 +-
 nixos/tests/home-assistant.nix                |  2 +-
 nixos/tests/hound.nix                         |  2 +-
 nixos/tests/hydra/default.nix                 |  2 +-
 nixos/tests/i3wm.nix                          |  4 +-
 nixos/tests/influxdb.nix                      |  2 +-
 nixos/tests/initrd-network-ssh/default.nix    |  6 +--
 nixos/tests/initrd-network.nix                |  2 +-
 nixos/tests/installer.nix                     |  2 +-
 nixos/tests/ipfs.nix                          |  4 +-
 nixos/tests/ipv6.nix                          |  6 +--
 nixos/tests/jenkins.nix                       |  4 +-
 nixos/tests/kafka.nix                         |  4 +-
 nixos/tests/kernel-copperhead.nix             |  2 +-
 nixos/tests/kernel-latest.nix                 |  2 +-
 nixos/tests/kernel-lts.nix                    |  2 +-
 nixos/tests/kexec.nix                         |  2 +-
 nixos/tests/krb5/deprecated-config.nix        |  2 +-
 nixos/tests/krb5/example-config.nix           |  2 +-
 nixos/tests/kubernetes/certs.nix              |  4 +-
 nixos/tests/kubernetes/dns.nix                |  2 +-
 nixos/tests/ldap.nix                          |  4 +-
 nixos/tests/lightdm.nix                       |  2 +-
 nixos/tests/login.nix                         |  2 +-
 nixos/tests/mathics.nix                       |  2 +-
 nixos/tests/memcached.nix                     |  2 +-
 nixos/tests/mesos.nix                         |  4 +-
 nixos/tests/minio.nix                         |  2 +-
 nixos/tests/misc.nix                          |  2 +-
 nixos/tests/mongodb.nix                       |  2 +-
 nixos/tests/morty.nix                         |  4 +-
 nixos/tests/mpd.nix                           |  6 +--
 nixos/tests/mumble.nix                        |  4 +-
 nixos/tests/munin.nix                         |  2 +-
 nixos/tests/mutable-users.nix                 |  4 +-
 nixos/tests/mysql-backup.nix                  |  2 +-
 nixos/tests/mysql-replication.nix             |  6 +--
 nixos/tests/mysql.nix                         |  2 +-
 nixos/tests/nat.nix                           |  8 ++--
 nixos/tests/netdata.nix                       |  2 +-
 nixos/tests/networking-proxy.nix              |  8 ++--
 nixos/tests/networking.nix                    | 40 +++++++++----------
 nixos/tests/nexus.nix                         |  2 +-
 nixos/tests/nfs.nix                           |  4 +-
 nixos/tests/nginx.nix                         |  2 +-
 nixos/tests/novacomd.nix                      |  2 +-
 nixos/tests/openssh.nix                       |  6 +--
 nixos/tests/owncloud.nix                      |  4 +-
 nixos/tests/pam-oath-login.nix                |  4 +-
 nixos/tests/partition.nix                     |  2 +-
 nixos/tests/peerflix.nix                      |  2 +-
 nixos/tests/pgjwt.nix                         |  2 +-
 nixos/tests/phabricator.nix                   |  6 +--
 nixos/tests/php-pcre.nix                      |  6 +--
 nixos/tests/plasma5.nix                       |  2 +-
 nixos/tests/plotinus.nix                      |  2 +-
 nixos/tests/postgis.nix                       |  2 +-
 nixos/tests/postgresql.nix                    |  2 +-
 nixos/tests/powerdns.nix                      |  2 +-
 nixos/tests/predictable-interface-names.nix   |  2 +-
 nixos/tests/printing.nix                      |  4 +-
 nixos/tests/prometheus.nix                    |  2 +-
 nixos/tests/prosody.nix                       |  2 +-
 nixos/tests/proxy.nix                         |  6 +--
 nixos/tests/quagga.nix                        | 10 ++---
 nixos/tests/quake3.nix                        |  4 +-
 nixos/tests/rabbitmq.nix                      |  2 +-
 nixos/tests/radicale.nix                      |  2 +-
 nixos/tests/riak.nix                          |  2 +-
 nixos/tests/run-in-machine.nix                |  2 +-
 nixos/tests/rxe.nix                           |  4 +-
 nixos/tests/samba.nix                         |  4 +-
 nixos/tests/sddm.nix                          |  6 +--
 nixos/tests/simple.nix                        |  2 +-
 nixos/tests/slim.nix                          |  2 +-
 nixos/tests/slurm.nix                         |  8 ++--
 nixos/tests/smokeping.nix                     |  2 +-
 nixos/tests/strongswan-swanctl.nix            |  6 +--
 nixos/tests/subversion.nix                    |  4 +-
 nixos/tests/sudo.nix                          |  2 +-
 nixos/tests/switch-test.nix                   |  4 +-
 nixos/tests/tomcat.nix                        |  2 +-
 nixos/tests/tor.nix                           |  4 +-
 nixos/tests/trac.nix                          |  8 ++--
 nixos/tests/transmission.nix                  |  2 +-
 nixos/tests/udisks2.nix                       |  2 +-
 nixos/tests/vault.nix                         |  2 +-
 nixos/tests/wordpress.nix                     |  4 +-
 nixos/tests/xdg-desktop-portal.nix            |  2 +-
 nixos/tests/xfce.nix                          |  2 +-
 nixos/tests/xmonad.nix                        |  2 +-
 nixos/tests/xrdp.nix                          |  6 +--
 nixos/tests/zfs.nix                           |  2 +-
 nixos/tests/zookeeper.nix                     |  2 +-
 279 files changed, 419 insertions(+), 424 deletions(-)

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index e14105f5f01..48288cf5962 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -47,7 +47,7 @@ rec {
       machinesNumbered = zipLists machines (range 1 254);
 
       nodes_ = flip map machinesNumbered (m: nameValuePair m.fst
-        [ ( { config, pkgs, nodes, ... }:
+        [ ( { config, nodes, ... }:
             let
               interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255);
               interfaces = flip map interfacesNumbered ({ fst, snd }:
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index ebfb09db7b7..bf32a36895c 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -24,9 +24,6 @@
   #   most likely fails as GRUB will probably refuse to install.
   partitionTableType ? "legacy"
 
-  # Whether to invoke switch-to-configuration boot during image creation
-, installBootLoader ? true
-
 , # The root file system type.
   fsType ? "ext4"
 
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
index c6bafd48f9d..8cd19b6e187 100644
--- a/nixos/lib/make-iso9660-image.nix
+++ b/nixos/lib/make-iso9660-image.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, closureInfo, xorriso, syslinux
+{ stdenv, closureInfo, xorriso, syslinux
 
 , # The file name of the resulting ISO image.
   isoName ? "cd.iso"
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 57acc990a48..42a0c60c7e1 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -222,7 +222,7 @@ in rec {
   runInMachineWithX = { require ? [], ... } @ args:
     let
       client =
-        { config, pkgs, ... }:
+        { ... }:
         {
           inherit require;
           virtualisation.memorySize = 1024;
diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index 371ee7d9180..242c2a4dd44 100644
--- a/nixos/maintainers/option-usages.nix
+++ b/nixos/maintainers/option-usages.nix
@@ -149,7 +149,7 @@ let
          else testOptions;
        checkAll = checkList == [];
      in
-       flip filter graph ({option, usedBy}:
+       flip filter graph ({option, ...}:
          (checkAll || elem option checkList)
          && !(elem option excludedTestOptions)
        );
@@ -165,7 +165,7 @@ let
   '';
 
   graphToText = graph:
-    concatMapStrings ({option, usedBy}:
+    concatMapStrings ({usedBy, ...}:
         concatMapStrings (user: ''
           ${user}
         '') usedBy
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index c7a6c943bc2..d9ecaa4818b 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -1,7 +1,7 @@
 # This module gets rid of all dependencies on X11 client libraries
 # (including fontconfig).
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index c595c693294..a74d551f50d 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -1,6 +1,6 @@
 # Configuration for the Name Service Switch (/etc/nsswitch.conf).
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index 4c37e8a6208..0277f1ad11e 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 2114fb2b9d4..74bff602a47 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix
index 9565a09b3a1..8dd81172738 100644
--- a/nixos/modules/config/unix-odbc-drivers.nix
+++ b/nixos/modules/config/unix-odbc-drivers.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 621ca36fb6b..0290eff22fb 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -282,7 +282,7 @@ let
 
   };
 
-  groupOpts = { name, config, ... }: {
+  groupOpts = { name, ... }: {
 
     options = {
 
diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix
index c7ac1b3530e..356e007c0a3 100644
--- a/nixos/modules/config/vpnc.nix
+++ b/nixos/modules/config/vpnc.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/hardware/network/smc-2632w/default.nix b/nixos/modules/hardware/network/smc-2632w/default.nix
index 650011aca81..b00286464f3 100644
--- a/nixos/modules/hardware/network/smc-2632w/default.nix
+++ b/nixos/modules/hardware/network/smc-2632w/default.nix
@@ -1,4 +1,4 @@
-{lib, config, ...}:
+{lib, ...}:
 
 {
   hardware = {
diff --git a/nixos/modules/hardware/network/zydas-zd1211.nix b/nixos/modules/hardware/network/zydas-zd1211.nix
index c8428a7241b..5dd7f30ed82 100644
--- a/nixos/modules/hardware/network/zydas-zd1211.nix
+++ b/nixos/modules/hardware/network/zydas-zd1211.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{pkgs, ...}:
 
 {
   hardware.firmware = [ pkgs.zd1211fw ];
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index 022fdea0a0a..2fa37af6ca5 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -1,6 +1,6 @@
 # This module provides the proprietary ATI X11 / OpenGL drivers.
 
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs_i686, ... }:
 
 with lib;
 
diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix
index aee15dcec6e..61bab533eda 100644
--- a/nixos/modules/hardware/video/capture/mwprocapture.nix
+++ b/nixos/modules/hardware/video/capture/mwprocapture.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
index 832e6196612..2cf5f13bc15 100644
--- a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
+++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix
@@ -1,6 +1,4 @@
-{ lib
-, stdenv
-, buildEnv
+{ buildEnv
 , libwebcam
 , makeWrapper
 , runCommand
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
index a4bcd7079a4..3336d512cfd 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [ ./installation-cd-graphical-kde.nix ];
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
index 4363c8e6c93..3911a2b01b1 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [ ./installation-cd-minimal.nix ];
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index 7ec55f159d0..3dc0f606bf6 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -1,7 +1,7 @@
 # This module defines a small NixOS installation CD.  It does not
 # contain any graphical stuff.
 
-{ config, lib, pkgs, ... }:
+{ ... }:
 
 {
   imports =
diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix
index 5e8f7f93d92..da7d760ad2f 100644
--- a/nixos/modules/installer/netboot/netboot-base.nix
+++ b/nixos/modules/installer/netboot/netboot-base.nix
@@ -1,7 +1,7 @@
 # This module contains the basic configuration for building netboot
 # images
 
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/installer/netboot/netboot-minimal.nix b/nixos/modules/installer/netboot/netboot-minimal.nix
index 8ad6234edc7..1563501a7e0 100644
--- a/nixos/modules/installer/netboot/netboot-minimal.nix
+++ b/nixos/modules/installer/netboot/netboot-minimal.nix
@@ -1,6 +1,6 @@
 # This module defines a small netboot environment.
 
-{ config, lib, ... }:
+{ ... }:
 
 {
   imports =
diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix
index 7e181acb93b..5c5fba56f51 100644
--- a/nixos/modules/installer/scan/detected.nix
+++ b/nixos/modules/installer/scan/detected.nix
@@ -1,6 +1,6 @@
 # List all devices which are detected by nixos-generate-config.
 # Common devices are enabled by default.
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 05029628672..af0a3a2fcc8 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -1,7 +1,7 @@
 # This module generates nixos-install, nixos-rebuild,
 # nixos-generate-config, etc.
 
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index f58c3658780..f823c0d83bb 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix
index 3b50e60a0ff..550b3ac97f6 100644
--- a/nixos/modules/misc/assertions.nix
+++ b/nixos/modules/misc/assertions.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix
index f4ee94ecc0d..8716e3d9fef 100644
--- a/nixos/modules/misc/extra-arguments.nix
+++ b/nixos/modules/misc/extra-arguments.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, ... }:
+{ pkgs, ... }:
 
 {
   _module.args = {
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 14c661553c6..782f6c8f69d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -9,7 +9,7 @@
 # Systemd can also change ownership of service directories using the
 # RuntimeDirectory/StateDirectory options.
 
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 
 {
   options = {
diff --git a/nixos/modules/misc/label.nix b/nixos/modules/misc/label.nix
index 8e5e57b3b83..02b91555b3c 100644
--- a/nixos/modules/misc/label.nix
+++ b/nixos/modules/misc/label.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/lib.nix b/nixos/modules/misc/lib.nix
index be8000ac029..121f396701e 100644
--- a/nixos/modules/misc/lib.nix
+++ b/nixos/modules/misc/lib.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   options = {
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index dd6a2f67b30..449149e4bb6 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -1,4 +1,4 @@
-{ config, options, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index 7a1e751394c..be3f4cbbcfe 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/misc/passthru.nix b/nixos/modules/misc/passthru.nix
index f3c9f6ba651..4e99631fdd8 100644
--- a/nixos/modules/misc/passthru.nix
+++ b/nixos/modules/misc/passthru.nix
@@ -1,7 +1,7 @@
 # This module allows you to export something from configuration
 # Use case: export kernel source expression for ease of configuring
 
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   options = {
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index f56640f1978..0d7124be0a5 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -3,7 +3,7 @@
 # enabled in the initrd.  Its primary use is in the NixOS installation
 # CDs.
 
-{ config, pkgs, ... }:
+{ ... }:
 
 {
 
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 406a69722de..5aaffa4f1f2 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -1,7 +1,7 @@
 # This module defines the software packages included in the "minimal"
 # installation CD.  It might be useful elsewhere.
 
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
   # Include some utilities that are useful for installing or repairing
diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix
index 7477795a94e..18f190071ba 100644
--- a/nixos/modules/profiles/demo.nix
+++ b/nixos/modules/profiles/demo.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   imports = [ ./graphical.nix ];
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index fe9851e79a6..332cf58aa53 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -1,7 +1,7 @@
 # This module defines a NixOS configuration with the Plasma 5 desktop.
 # It's used by the graphical installation CD.
 
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   services.xserver = {
diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 456538742f5..2af8bf1f8e3 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -1,7 +1,7 @@
 # A profile with most (vanilla) hardening options enabled by default,
 # potentially at the cost of features and performance.
 
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix
index 67f8d633bab..131ee272859 100644
--- a/nixos/modules/profiles/headless.nix
+++ b/nixos/modules/profiles/headless.nix
@@ -1,7 +1,7 @@
 # Common configuration for headless machines (e.g., Amazon EC2
 # instances).
 
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index 40df7063a9b..ed04e46c77d 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -1,7 +1,7 @@
 # This module defines a small NixOS configuration.  It does not
 # contain any graphical stuff.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index a1ec1d45395..315d04093b1 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -1,7 +1,7 @@
 # Common configuration for virtual machines running under QEMU (using
 # virtio).
 
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
index b91bd98047e..4651cdb76e0 100644
--- a/nixos/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
@@ -1,6 +1,6 @@
 # Global configuration for atop.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/programs/bcc.nix b/nixos/modules/programs/bcc.nix
index 3522ab22fa8..d76249bb5ca 100644
--- a/nixos/modules/programs/bcc.nix
+++ b/nixos/modules/programs/bcc.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   options.programs.bcc.enable = lib.mkEnableOption "bcc";
 
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 06ebb7bc729..3bac8d98990 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -2,7 +2,7 @@
 
 # Most of the stuff here should probably be moved elsewhere sometime.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 26ef1875992..3b5212c9e76 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -1,6 +1,6 @@
 # This module defines a standard configuration for NixOS shells.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/programs/systemtap.nix b/nixos/modules/programs/systemtap.nix
index fd84732cd41..ca81e018c9d 100644
--- a/nixos/modules/programs/systemtap.nix
+++ b/nixos/modules/programs/systemtap.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix
index 96443fda758..55a48ea3c9c 100644
--- a/nixos/modules/security/hidepid.nix
+++ b/nixos/modules/security/hidepid.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 with lib;
 
 {
diff --git a/nixos/modules/security/oath.nix b/nixos/modules/security/oath.nix
index 20f3e2dd9f8..93bdc851117 100644
--- a/nixos/modules/security/oath.nix
+++ b/nixos/modules/security/oath.nix
@@ -1,6 +1,6 @@
 # This module provides configuration for the OATH PAM modules.
 
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index be02ba56795..a0565ca2620 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -97,7 +97,7 @@ let
     ${dir_cfg.extraConfig}
     '';
 
-  directorOptions = {name, config, ...}:
+  directorOptions = {...}:
   {
     options = {
       password = mkOption {
@@ -117,7 +117,7 @@ let
     };
   };
 
-  deviceOptions = {name, config, ...}:
+  deviceOptions = {...}:
   {
     options = {
       archiveDevice = mkOption {
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 0c3fc9af6f8..415a70ea5ad 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -510,7 +510,7 @@ in {
     '';
     default = { };
     type = types.attrsOf (types.submodule (
-      { name, config, ... }: {
+      { ... }: {
         options = {
           
           path = mkOption {
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 409c05221d0..9b31ff3b582 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -6,7 +6,7 @@ with lib;
     description = ''
       Periodic backups to create with Restic.
     '';
-    type = types.attrsOf (types.submodule ({ name, config, ... }: {
+    type = types.attrsOf (types.submodule ({ name, ... }: {
       options = {
         passwordFile = mkOption {
           type = types.str;
diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix
index d8f55fb826f..92deabc3dd3 100644
--- a/nixos/modules/services/continuous-integration/jenkins/slave.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 with lib;
 let
   cfg = config.services.jenkinsSlave;
diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix
index b16a8f50a3d..4168140b287 100644
--- a/nixos/modules/services/hardware/actkbd.nix
+++ b/nixos/modules/services/hardware/actkbd.nix
@@ -15,7 +15,7 @@ let
     ${cfg.extraConfig}
   '';
 
-  bindingCfg = { config, ... }: {
+  bindingCfg = { ... }: {
     options = {
 
       keys = mkOption {
diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix
index eb1713baa14..d53175052c7 100644
--- a/nixos/modules/services/hardware/nvidia-optimus.nix
+++ b/nixos/modules/services/hardware/nvidia-optimus.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 let kernel = config.boot.kernelPackages; in
 
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
index 1923addeb3a..f6ed4e25e9c 100644
--- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
+++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix
@@ -9,7 +9,7 @@ let
 
   etcFiles = pkgs.callPackage ./brscan4_etc_files.nix { netDevices = netDeviceList; };
 
-  netDeviceOpts = { name, config, ... }: {
+  netDeviceOpts = { name, ... }: {
 
     options = {
 
diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix
index 2c9bc18c8c3..d0824df38ae 100644
--- a/nixos/modules/services/logging/journalwatch.nix
+++ b/nixos/modules/services/logging/journalwatch.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, services, ... }:
+{ config, lib, pkgs, ... }:
 with lib;
 
 let
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 04df97fdbbe..e6091182b2a 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -110,7 +110,7 @@ let
       special_use = \${toString mailbox.specialUse}
   '' + "}";
 
-  mailboxes = { lib, pkgs, ... }: {
+  mailboxes = { ... }: {
     options = {
       name = mkOption {
         type = types.strMatching ''[^"]+'';
diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix
index cfe1b5496a4..fed313e4738 100644
--- a/nixos/modules/services/mail/mail.nix
+++ b/nixos/modules/services/mail/mail.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
index 92a68b60251..64cc9c610ac 100644
--- a/nixos/modules/services/misc/emby.nix
+++ b/nixos/modules/services/misc/emby.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, mono, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix
index db72d36f2ac..8d1b3d225a4 100644
--- a/nixos/modules/services/misc/jackett.nix
+++ b/nixos/modules/services/misc/jackett.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, mono, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index 8b493041b2c..12bed05757a 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix
index 295e7fb0ba0..6f75e4dd03e 100644
--- a/nixos/modules/services/misc/nix-optimise.nix
+++ b/nixos/modules/services/misc/nix-optimise.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix
index 87ed7f0a61b..7ce3841be2f 100644
--- a/nixos/modules/services/misc/nix-ssh-serve.nix
+++ b/nixos/modules/services/misc/nix-ssh-serve.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 let cfg = config.nix.sshServe;
diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix
index 7738eacc6ae..1a9fad3883c 100644
--- a/nixos/modules/services/misc/radarr.nix
+++ b/nixos/modules/services/misc/radarr.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, mono, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix
index edba4e6c23e..97b67a0b503 100644
--- a/nixos/modules/services/misc/sonarr.nix
+++ b/nixos/modules/services/misc/sonarr.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, mono, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 7daf12f9171..5f97abf1871 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -84,7 +84,7 @@ let
     in flatten (mapAttrsToList mkSublist attrs);
   in all isNull (findPkiDefinitions [] manualPkiOptions);
 
-  orgOptions = { name, ... }: {
+  orgOptions = { ... }: {
     options.users = mkOption {
       type = types.uniq (types.listOf types.str);
       default = [];
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 8d2c303a69e..9c58a15bcd7 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -94,7 +94,7 @@ let
     };
   });
 
-  mkSubModule = { name, port, extraOpts, serviceOpts }: {
+  mkSubModule = { name, port, extraOpts, ... }: {
     ${name} = mkOption {
       type = types.submodule {
         options = (mkExporterOpts {
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index fecae4ca1b3..c345ec48a01 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -64,7 +64,7 @@ let
        "DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"}
   '';
 
-  smartdDeviceOpts = { name, ... }: {
+  smartdDeviceOpts = { ... }: {
 
     options = {
 
diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
index 182fabf6405..e06a80e443d 100644
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -139,7 +139,7 @@ in
       description = ''
         BeeGFS configurations. Every mount point requires a separate configuration.
       '';
-      type = with types; attrsOf (submodule ({ config, ... } : {
+      type = with types; attrsOf (submodule ({ ... } : {
         options = {
           mgmtdHost = mkOption {
             type = types.str;
diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix
index 255740ac65e..a0d4a3a9705 100644
--- a/nixos/modules/services/network-filesystems/openafs/lib.nix
+++ b/nixos/modules/services/network-filesystems/openafs/lib.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ...}:
+{ config, lib, ...}:
 
 let
   inherit (lib) concatStringsSep getBin mkOption types;
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 81e11db1040..2ec5a10b481 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -1,5 +1,5 @@
 # Avahi daemon.
-{ config, lib, utils, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 39b62bdc709..c40962f4aa8 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -9,7 +9,7 @@ let
   cfg = config.services.cjdns;
 
   connectToSubmodule =
-  { options, ... }:
+  { ... }:
   { options =
     { password = mkOption {
       type = types.str;
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 4f219fe56b4..3afafaf3fed 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -405,7 +405,7 @@ in
       outTunnels = mkOption {
         default = {};
         type = with types; loaOf (submodule (
-          { name, config, ... }: {
+          { name, ... }: {
             options = {
               destinationPort = mkOption {
                 type = types.int;
@@ -426,7 +426,7 @@ in
       inTunnels = mkOption {
         default = {};
         type = with types; loaOf (submodule (
-          { name, config, ... }: {
+          { name, ... }: {
             options = {
               inPort = mkOption {
                 type = types.int;
diff --git a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
index cce65be321a..51f1d081b97 100644
--- a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
+++ b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 { options.services.nghttpx = {
     enable = lib.mkEnableOption "nghttpx";
 
diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix
index b7b59d95bf0..613b0e0fb51 100644
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@@ -22,7 +22,7 @@ let
     Deny-IP=${concatStringsSep " " cfg.deniedIPRanges}
   '';
 
-  nylonOpts = { name, config, ... }: {
+  nylonOpts = { name, ... }: {
 
     options = {
 
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix
index 513e6174752..56a612b9105 100644
--- a/nixos/modules/services/networking/pptpd.nix
+++ b/nixos/modules/services/networking/pptpd.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index 9784f1d160f..1ea676d0f92 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, options, ... }:
+{ pkgs, lib, config, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 7b2d1920f0f..c16fbe8a52f 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -479,7 +479,7 @@ in
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
                     message = "cannot enable X11 forwarding without setting xauth location";}]
-      ++ flip map cfg.listenAddresses ({ addr, port, ... }: {
+      ++ flip map cfg.listenAddresses ({ addr, ... }: {
         assertion = addr != null;
         message = "addr must be specified in each listenAddresses entry";
       });
diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index f5baea9222b..b7655f4bec6 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix
index f495c39967e..ccf87999663 100644
--- a/nixos/modules/services/networking/tvheadend.nix
+++ b/nixos/modules/services/networking/tvheadend.nix
@@ -1,4 +1,4 @@
-{ config, coreutils, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index acb4778d848..1b87b77f976 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -10,7 +10,7 @@ let
 
   # interface options
 
-  interfaceOpts = { name, ... }: {
+  interfaceOpts = { ... }: {
 
     options = {
 
diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix
index 5e006c13f0d..46111a76af8 100644
--- a/nixos/modules/services/networking/xl2tpd.nix
+++ b/nixos/modules/services/networking/xl2tpd.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix
index 274bbca53fa..06ccd7032e6 100644
--- a/nixos/modules/services/networking/zerobin.nix
+++ b/nixos/modules/services/networking/zerobin.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, nodes, ... }:
+{ config, pkgs, lib, ... }:
 with lib;
 let
   cfg = config.services.zerobin;
diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix
index 2aa2c57fd22..a9ad5497a65 100644
--- a/nixos/modules/services/security/oauth2_proxy_nginx.nix
+++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, ... }:
+{ config, lib, ... }:
 with lib;
 let
   cfg = config.services.oauth2_proxy.nginx;
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index dcb41d187c2..def77ba69e5 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -578,7 +578,7 @@ in
             ];
           }
         '';
-        type = types.loaOf (types.submodule ({name, config, ...}: {
+        type = types.loaOf (types.submodule ({name, ...}: {
           options = {
 
              name = mkOption {
@@ -638,7 +638,7 @@ in
              authorizeClient = mkOption {
                default = null;
                description = "If configured, the hidden service is accessible for authorized clients only.";
-               type = types.nullOr (types.submodule ({config, ...}: {
+               type = types.nullOr (types.submodule ({...}: {
 
                  options = {
 
diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix
index 4b9038e3e25..ca63f529a5d 100644
--- a/nixos/modules/services/torrent/flexget.nix
+++ b/nixos/modules/services/torrent/flexget.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, timezone, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index 42affb06b51..fbbd7715c6b 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, services, ... }:
+{ config, lib, pkgs, ... }:
 with lib;
 let
   cfg = config.services.matomo;
diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix
index e057e302562..8c675c64200 100644
--- a/nixos/modules/services/web-apps/youtrack.nix
+++ b/nixos/modules/services/web-apps/youtrack.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, options, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
index 6f1f67970f6..77194f34749 100644
--- a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, serverInfo, php, ... }:
+{ config, lib, pkgs, serverInfo, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
index 6dd91be00a7..4b8ee2b17ea 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, serverInfo, lib, ... }:
+{ config, pkgs, lib, ... }:
 
 let
   inherit (pkgs) mercurial;
diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 1c654667dfc..c810b914e25 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, serverInfo, php, ... }:
+{ config, lib, pkgs, serverInfo, ... }:
 # http://codex.wordpress.org/Hardening_WordPress
 
 with lib;
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index e4494dff37d..1075b00768f 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -3,7 +3,7 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{ config, lib }:
+{ lib, ... }:
 
 with lib;
 {
diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
index 1dcc3ac9d8d..4cad2a2ff77 100644
--- a/nixos/modules/services/web-servers/zope2.nix
+++ b/nixos/modules/services/web-servers/zope2.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.services.zope2;
 
-  zope2Opts = { name, config, ... }: {
+  zope2Opts = { name, ... }: {
     options = {
 
       name = mkOption {
diff --git a/nixos/modules/services/x11/display-managers/auto.nix b/nixos/modules/services/x11/display-managers/auto.nix
index c02ccdf12b6..d2aae64bf22 100644
--- a/nixos/modules/services/x11/display-managers/auto.nix
+++ b/nixos/modules/services/x11/display-managers/auto.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index 09a7f386876..503c14c9b62 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -5,7 +5,7 @@
 # not, a X server (Xvfb) is started for that user.  The Xvfb instances
 # persist across VNC sessions.
 
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index e617e55a7a5..06c59342b45 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix
index 30c8df78224..a414d8d4ac6 100644
--- a/nixos/modules/services/x11/window-managers/wmii.nix
+++ b/nixos/modules/services/x11/window-managers/wmii.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, options, modulesPath, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 let
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 3048cd02683..b45e510f6b8 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index e2d1dd49ef0..da29e08b369 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -226,7 +226,7 @@ in
       default = [];
       example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]";
       type = types.listOf (types.submodule (
-        { options, ... }: {
+        { ... }: {
           options.original = mkOption {
             type = types.package;
             description = "The original package to override.";
diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 3fc1af28f62..3e5d7b40f2c 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
 {
   config = lib.mkIf (pkgs.kexectools.meta.available) {
diff --git a/nixos/modules/system/boot/loader/loader.nix b/nixos/modules/system/boot/loader/loader.nix
index 28cceafea7c..7fbda9ef0f5 100644
--- a/nixos/modules/system/boot/loader/loader.nix
+++ b/nixos/modules/system/boot/loader/loader.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 9aa557ac859..ce770d06760 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -523,7 +523,7 @@ let
 
   };
 
-  networkConfig = { name, config, ... }: {
+  networkConfig = { config, ... }: {
     config = {
       matchConfig = optionalAttrs (config.name != null) {
         Name = config.name;
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index e1095fb988e..fc68904ae08 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 let
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 500c2d40661..ed149f4791b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -193,7 +193,7 @@ let
         x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; };
     in "${x}/bin/${mkScriptName name}";
 
-  unitConfig = { name, config, ... }: {
+  unitConfig = { config, ... }: {
     config = {
       unitConfig =
         optionalAttrs (config.requires != [])
@@ -275,7 +275,7 @@ let
       ];
   };
 
-  mountConfig = { name, config, ... }: {
+  mountConfig = { config, ... }: {
     config = {
       mountConfig =
         { What = config.what;
@@ -288,7 +288,7 @@ let
     };
   };
 
-  automountConfig = { name, config, ... }: {
+  automountConfig = { config, ... }: {
     config = {
       automountConfig =
         { Where = config.where;
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index 18aad58b36c..8d8bfe5900a 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix
index 3bfdf89e0cf..8bab91c721f 100644
--- a/nixos/modules/tasks/bcache.nix
+++ b/nixos/modules/tasks/bcache.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
 
diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix
index 3a8999c242b..a14a3ac3854 100644
--- a/nixos/modules/tasks/filesystems/ext.nix
+++ b/nixos/modules/tasks/filesystems/ext.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   config = {
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index c640e886fca..2318bdd1d58 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, utils, ... }:
+{ config, lib, utils, ... }:
 
 with utils;
 with lib;
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 7053aa57f80..20a740ce1f0 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1,4 +1,4 @@
-{ config, options, lib, pkgs, utils, stdenv, ... }:
+{ config, options, lib, pkgs, utils, ... }:
 
 with lib;
 with utils;
diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix
index 69599bda6d3..a9d987780ee 100644
--- a/nixos/modules/tasks/scsi-link-power-management.nix
+++ b/nixos/modules/tasks/scsi-link-power-management.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix
index 1b142fb8fd3..93e03c44c86 100644
--- a/nixos/modules/tasks/swraid.nix
+++ b/nixos/modules/tasks/swraid.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
 
diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index 1f8f2891e98..3575a291b2b 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix
index dfe8b430e04..25490d67115 100644
--- a/nixos/modules/testing/service-runner.nix
+++ b/nixos/modules/testing/service-runner.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index 9ecdcf23e5f..1a45c3093b7 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   options = {
     ec2 = {
diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix
index 5cd2304a295..03239991b95 100644
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixos/modules/virtualisation/azure-common.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 {
diff --git a/nixos/modules/virtualisation/azure-config-user.nix b/nixos/modules/virtualisation/azure-config-user.nix
index de1b3857923..267ba50ae02 100644
--- a/nixos/modules/virtualisation/azure-config-user.nix
+++ b/nixos/modules/virtualisation/azure-config-user.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   # To build the configuration or use nix-env, you need to run
diff --git a/nixos/modules/virtualisation/azure-config.nix b/nixos/modules/virtualisation/azure-config.nix
index 5c9f18ef52a..780bd1b78dc 100644
--- a/nixos/modules/virtualisation/azure-config.nix
+++ b/nixos/modules/virtualisation/azure-config.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [ "${modulesPath}/virtualisation/azure-image.nix" ];
diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix
index 528ffecc0bf..0a018e4cd69 100644
--- a/nixos/modules/virtualisation/brightbox-config.nix
+++ b/nixos/modules/virtualisation/brightbox-config.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ];
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index c3044ea124c..31f5f6fe780 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -257,7 +257,7 @@ let
 
   system = config.nixpkgs.localSystem.system;
 
-  bindMountOpts = { name, config, ... }: {
+  bindMountOpts = { name, ... }: {
 
     options = {
       mountPoint = mkOption {
@@ -284,7 +284,7 @@ let
 
   };
 
-  allowedDeviceOpts = { name, config, ... }: {
+  allowedDeviceOpts = { ... }: {
     options = {
       node = mkOption {
         example = "/dev/net/tun";
diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix
index 9535e3e0d67..2f304094d55 100644
--- a/nixos/modules/virtualisation/docker-image.nix
+++ b/nixos/modules/virtualisation/docker-image.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   imports = [
diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index f6bca1aa857..8f20100bc1b 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   imports = [ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ];
diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix
index dbb7b881955..d4936484018 100644
--- a/nixos/modules/virtualisation/lxc-container.nix
+++ b/nixos/modules/virtualisation/lxc-container.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
index c1d2a314daf..cecf2a3f144 100644
--- a/nixos/modules/virtualisation/nova-config.nix
+++ b/nixos/modules/virtualisation/nova-config.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
 
 with lib;
 
diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix
index b46002c10b5..c00b984c2ce 100644
--- a/nixos/modules/virtualisation/xen-domU.nix
+++ b/nixos/modules/virtualisation/xen-domU.nix
@@ -1,6 +1,6 @@
 # Common configuration for Xen DomU NixOS virtual machines.
 
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   boot.loader.grub.version = 2;
diff --git a/nixos/release.nix b/nixos/release.nix
index f11f372335a..dfa4ee9e127 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -45,7 +45,7 @@ let
 
 
   makeIso =
-    { module, type, maintainers ? ["eelco"], system }:
+    { module, type, system, ... }:
 
     with import nixpkgs { inherit system; };
 
@@ -56,7 +56,7 @@ let
 
 
   makeSdImage =
-    { module, maintainers ? ["dezgeg"], system }:
+    { module, system, ... }:
 
     with import nixpkgs { inherit system; };
 
@@ -96,7 +96,7 @@ let
   buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix {
     inherit system;
     modules = [ module versionModule ] ++ singleton
-      ({ config, lib, ... }:
+      ({ ... }:
       { fileSystems."/".device  = mkDefault "/dev/sda1";
         boot.loader.grub.device = mkDefault "/dev/sda";
       });
@@ -128,15 +128,15 @@ in rec {
 
   channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; };
 
-  manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
-  manualEpub = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualEpub));
-  manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
-  manualGeneratedSources = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.generatedSources);
-  options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
+  manual = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manual);
+  manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub));
+  manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages);
+  manualGeneratedSources = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.generatedSources);
+  options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
 
 
   # Build the initial ramdisk so Hydra can keep track of its size over time.
-  initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
+  initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk);
 
   netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot {
     inherit system;
@@ -195,7 +195,7 @@ in rec {
   dummy = forAllSystems (system: pkgs.runCommand "dummy"
     { toplevel = (import lib/eval-config.nix {
         inherit system;
-        modules = singleton ({ config, pkgs, ... }:
+        modules = singleton ({ ... }:
           { fileSystems."/".device  = mkDefault "/dev/sda1";
             boot.loader.grub.device = mkDefault "/dev/sda";
             system.nixos.stateVersion = mkDefault "18.03";
@@ -424,27 +424,27 @@ in rec {
 
   closures = {
 
-    smallContainer = makeClosure ({ pkgs, ... }:
+    smallContainer = makeClosure ({ ... }:
       { boot.isContainer = true;
         services.openssh.enable = true;
       });
 
-    tinyContainer = makeClosure ({ pkgs, ... }:
+    tinyContainer = makeClosure ({ ... }:
       { boot.isContainer = true;
         imports = [ modules/profiles/minimal.nix ];
       });
 
-    ec2 = makeClosure ({ pkgs, ... }:
+    ec2 = makeClosure ({ ... }:
       { imports = [ modules/virtualisation/amazon-image.nix ];
       });
 
-    kde = makeClosure ({ pkgs, ... }:
+    kde = makeClosure ({ ... }:
       { services.xserver.enable = true;
         services.xserver.displayManager.sddm.enable = true;
         services.xserver.desktopManager.plasma5.enable = true;
       });
 
-    xfce = makeClosure ({ pkgs, ... }:
+    xfce = makeClosure ({ ... }:
       { services.xserver.enable = true;
         services.xserver.desktopManager.xfce.enable = true;
       });
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index c5898db6b32..6d728b387e1 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -1,5 +1,5 @@
 let
-  commonConfig = { config, lib, pkgs, nodes, ... }: {
+  commonConfig = { lib, nodes, ... }: {
     networking.nameservers = [
       nodes.letsencrypt.config.networking.primaryIPAddress
     ];
diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix
index e1dee71fddf..fedfde233e8 100644
--- a/nixos/tests/ammonite.nix
+++ b/nixos/tests/ammonite.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     amm =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
         {
           environment.systemPackages = [ pkgs.ammonite ];
         };
diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
index ef848c2a374..9f367d4c1d2 100644
--- a/nixos/tests/atd.nix
+++ b/nixos/tests/atd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test.nix ({ pkgs, ... }:
 
 {
   name = "atd";
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, lib, ... }:
   };
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
     { services.atd.enable = true;
       users.users.alice = { isNormalUser = true; };
     };
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index 976a770e887..dfb60998941 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   };
 
   nodes = let
-    cfg = { config, pkgs, ... }: {
+    cfg = { ... }: {
       services.avahi = {
         enable = true;
         nssmdns = true;
diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix
index 433910feafe..9c241fd2301 100644
--- a/nixos/tests/beegfs.nix
+++ b/nixos/tests/beegfs.nix
@@ -1,9 +1,9 @@
-import ./make-test.nix ({ pkgs, ... } :
+import ./make-test.nix ({ ... } :
 
 let
   connAuthFile="beegfs/auth-def.key";
 
-  client = { config, pkgs, lib, ... } : {
+  client = { pkgs, ... } : {
     networking.firewall.enable = false;
     services.beegfsEnable = true;
     services.beegfs.default = {
@@ -31,7 +31,7 @@ let
   };
 
 
-  server = service : { config, pkgs, lib, ... } : {
+  server = service : { pkgs, ... } : {
     networking.firewall.enable = false;
     boot.initrd.postDeviceCommands = ''
       ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 50c98664660..609b1ff7a83 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -30,7 +30,7 @@ in
 
   nodes =
     { tracker =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission pkgs.opentracker ];
 
           # We need Apache on the tracker to serve the torrents.
@@ -42,7 +42,7 @@ in
         };
 
       router =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         { environment.systemPackages = [ pkgs.miniupnpd ];
           virtualisation.vlans = [ 1 2 ];
           networking.nat.enable = true;
@@ -52,7 +52,7 @@ in
         };
 
       client1 =
-        { config, pkgs, nodes, ... }:
+        { pkgs, nodes, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
           networking.defaultGateway =
@@ -61,7 +61,7 @@ in
         };
 
       client2 =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
           networking.firewall.enable = false;
         };
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index 36731773de2..9b39abdfa8e 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -41,7 +41,7 @@ in {
   };
 
   nodes = {
-    client = { config, pkgs, ... }: {
+    client = { ... }: {
       services.borgbackup.jobs = {
         
         local = rec {
@@ -84,7 +84,7 @@ in {
       };
     };
 
-    server = { config, pkgs, ... }: {
+    server = { ... }: {
       services.openssh = {
         enable = true;
         passwordAuthentication = false;
diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix
index 828846f17c8..cf408dc7fec 100644
--- a/nixos/tests/buildbot.nix
+++ b/nixos/tests/buildbot.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   name = "buildbot";
 
   nodes = {
-    bbmaster = { config, pkgs, ... }: {
+    bbmaster = { pkgs, ... }: {
       services.buildbot-master = {
         enable = true;
         package = pkgs.buildbot-full;
@@ -22,7 +22,7 @@ import ./make-test.nix ({ pkgs, ... } : {
       environment.systemPackages = with pkgs; [ git buildbot-full ];
     };
 
-    bbworker = { config, pkgs, ... }: {
+    bbworker = { pkgs, ... }: {
       services.buildbot-worker = {
         enable = true;
         masterUrl = "bbmaster:9989";
@@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, ... } : {
       environment.systemPackages = with pkgs; [ git buildbot-worker ];
     };
 
-    gitrepo = { config, pkgs, ... }: {
+    gitrepo = { pkgs, ... }: {
       services.openssh.enable = true;
       networking.firewall.allowedTCPPorts = [ 22 9418 ];
       environment.systemPackages = with pkgs; [ git ];
diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix
index f0083ab18e4..e60bae4b700 100644
--- a/nixos/tests/cadvisor.nix
+++ b/nixos/tests/cadvisor.nix
@@ -5,11 +5,11 @@ import ./make-test.nix ({ pkgs, ... } : {
   };
 
   nodes = {
-    machine = { config, pkgs, ... }: {
+    machine = { ... }: {
       services.cadvisor.enable = true;
     };
 
-    influxdb = { config, pkgs, lib, ... }: with lib; {
+    influxdb = { lib, ... }: with lib; {
       services.cadvisor.enable = true;
       services.cadvisor.storageDriver = "influxdb";
       services.influxdb.enable = true;
diff --git a/nixos/tests/cassandra.nix b/nixos/tests/cassandra.nix
index b729e6b158b..ca8f35ef3bf 100644
--- a/nixos/tests/cassandra.nix
+++ b/nixos/tests/cassandra.nix
@@ -24,9 +24,9 @@ in
   name = "cassandra-ci";
 
   nodes = {
-    cass0 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.1" {};
-    cass1 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.2" {};
-    cass2 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.3" {
+    cass0 = { nodes, ... }: nodeCfg nodes "192.168.1.1" {};
+    cass1 = { nodes, ... }: nodeCfg nodes "192.168.1.2" {};
+    cass2 = { nodes, ... }: nodeCfg nodes "192.168.1.3" {
       extraParams = [
         ''JVM_OPTS="$JVM_OPTS -Dcassandra.replace_address=192.168.1.2"''
       ];
diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix
index b9993062c07..dd45f0157b0 100644
--- a/nixos/tests/ceph.nix
+++ b/nixos/tests/ceph.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({pkgs, ...}: rec {
   };
 
   nodes = {
-    aio = { config, pkgs, ... }: {
+    aio = { pkgs, ... }: {
       virtualisation = {
         emptyDiskImages = [ 20480 20480 ];
         vlans = [ 1 ];
@@ -55,7 +55,7 @@ import ./make-test.nix ({pkgs, ...}: rec {
     };
   };
   
-  testScript = { nodes, ... }: ''
+  testScript = { ... }: ''
     startAll;
 
     $aio->waitForUnit("network.target");
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index db89c496944..ab5f8e0bcf3 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -4,7 +4,7 @@ let
   carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52";
 
   basicConfig =
-    { config, pkgs, ... }:
+    { ... }:
     { services.cjdns.enable = true;
 
       # Turning off DHCP isn't very realistic but makes
@@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   nodes = rec
     { # Alice finds peers over over ETHInterface.
       alice =
-        { config, ... }:
+        { ... }:
         { imports = [ basicConfig ];
 
           services.cjdns.ETHInterface.bind = "eth1";
@@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       # Bob explicitly connects to Carol over UDPInterface.
       bob =
-        { config, lib, nodes, ... }:
+        { ... }:
 
         { imports = [ basicConfig ];
 
@@ -63,7 +63,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       # Carol listens on ETHInterface and UDPInterface,
       # but knows neither Alice or Bob.
       carol =
-        { config, lib, nodes, ... }:
+        { ... }:
         { imports = [ basicConfig ];
 
           environment.etc."cjdns.keys".text = ''
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix
index 2a258e4bff5..303e7408646 100644
--- a/nixos/tests/cloud-init.nix
+++ b/nixos/tests/cloud-init.nix
@@ -31,7 +31,7 @@ in makeTest {
     maintainers = [ lewo ];
   };
   machine =
-    { config, pkgs, ... }:
+    { ... }:
     {
       virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ];
       services.cloud-init.enable = true;
diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix
index dc50e14750b..9cd531a1f96 100644
--- a/nixos/tests/common/user-account.nix
+++ b/nixos/tests/common/user-account.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 
 { users.users.alice =
     { isNormalUser = true;
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index dfef46a2ada..bd8bd5dee9c 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
index df3f3354b2d..8f874b3585d 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixos/tests/containers-extra_veth.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix
index df1ef6d1493..8cf298c6225 100644
--- a/nixos/tests/containers-hosts.nix
+++ b/nixos/tests/containers-hosts.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, lib, ... }:
+    { lib, ... }:
     {
       virtualisation.memorySize = 256;
       virtualisation.vlans = [];
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
index 821ce1cd07d..c4d954592ef 100644
--- a/nixos/tests/containers-ipv4.nix
+++ b/nixos/tests/containers-ipv4.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix
index f676ed122bb..7db389a18e7 100644
--- a/nixos/tests/containers-ipv6.nix
+++ b/nixos/tests/containers-ipv6.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix
index 390dc4ad2c2..2bdb926a8e2 100644
--- a/nixos/tests/containers-macvlans.nix
+++ b/nixos/tests/containers-macvlans.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   nodes = {
 
     machine1 =
-      { config, pkgs, lib, ... }:
+      { lib, ... }:
       {
         virtualisation.memorySize = 256;
         virtualisation.vlans = [ 1 ];
@@ -55,7 +55,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
 
     machine2 =
-      { config, pkgs, ... }:
+      { ... }:
       {
         virtualisation.memorySize = 256;
         virtualisation.vlans = [ 1 ];
diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix
index bde8e175f95..1e312f59f43 100644
--- a/nixos/tests/containers-physical_interfaces.nix
+++ b/nixos/tests/containers-physical_interfaces.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    server = { config, pkgs, ... }:
+    server = { ... }:
       {
         virtualisation.memorySize = 256;
         virtualisation.vlans = [ 1 ];
@@ -23,7 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : {
           };
         };
       };
-    bridged = { config, pkgs, ... }: {
+    bridged = { ... }: {
       virtualisation.memorySize = 128;
       virtualisation.vlans = [ 1 ];
 
@@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
     };
 
-    bonded = { config, pkgs, ... }: {
+    bonded = { ... }: {
       virtualisation.memorySize = 128;
       virtualisation.vlans = [ 1 ];
 
@@ -62,7 +62,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
     };
 
-    bridgedbond = { config, pkgs, ... }: {
+    bridgedbond = { ... }: {
       virtualisation.memorySize = 128;
       virtualisation.vlans = [ 1 ];
 
diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
index 78cc445c2dd..be83f82445e 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixos/tests/containers-portforward.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index 15862ac64c1..9726ca0cb0e 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -21,11 +21,11 @@ in {
   };
 
   nodes = {
-    client = { lib, pkgs, ... }: {
+    client = { ... }: {
       imports = [ client_base ];
     };
 
-    client_c1 = { lib, pkgs, ... }: {
+    client_c1 = { lib, ... }: {
       imports = [ client_base ];
 
       containers.test1.config = {
@@ -34,7 +34,7 @@ in {
         services.httpd.adminAddr = "nixos@example.com";
       };
     };
-    client_c2 = { lib, pkgs, ... }: {
+    client_c2 = { lib, ... }: {
       imports = [ client_base ];
 
       containers.test1.config = {
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
index f68c9b07759..aeb0a6e68e2 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixos/tests/containers-restart_networking.nix
@@ -17,7 +17,7 @@ let
       };
     };
   };
-in import ./make-test.nix ({ pkgs, lib, ...} :
+in import ./make-test.nix ({ pkgs, ...} :
 {
   name = "containers-restart_networking";
   meta = with pkgs.stdenv.lib.maintainers; {
@@ -25,7 +25,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} :
   };
 
   nodes = {
-    client = { lib, pkgs, ... }: client_base // {
+    client = { lib, ... }: client_base // {
       virtualisation.vlans = [ 1 ];
 
       networking.bridges.br0 = {
@@ -38,7 +38,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} :
       };
 
     };
-    client_eth1 = { lib, pkgs, ... }: client_base // {
+    client_eth1 = { lib, ... }: client_base // {
       networking.bridges.br0 = {
         interfaces = [ "eth1" ];
         rstp = false;
@@ -48,7 +48,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} :
         br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
       };
     };
-    client_eth1_rstp = { lib, pkgs, ... }: client_base // {
+    client_eth1_rstp = { lib, ... }: client_base // {
       networking.bridges.br0 = {
         interfaces = [ "eth1" ];
         rstp = true;
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
index 873dd364369..05c21f4907b 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixos/tests/containers-tmpfs.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ ../modules/installer/cd-dvd/channel.nix ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 768;
diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix
index a3f675236bc..48ea48eebbb 100644
--- a/nixos/tests/couchdb.nix
+++ b/nixos/tests/couchdb.nix
@@ -10,14 +10,14 @@ with lib;
 
   nodes = {
     couchdb1 =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       { environment.systemPackages = with pkgs; [ jq ];
         services.couchdb.enable = true;
       };
 
     couchdb2 =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       { environment.systemPackages = with pkgs; [ jq ];
         services.couchdb.enable = true;
diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix
index 6119fd58447..b4be5e465cc 100644
--- a/nixos/tests/deluge.nix
+++ b/nixos/tests/deluge.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     server =
-      { pkgs, config, ... }:
+      { ... }:
 
       { services.deluge = {
           enable = true;
diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix
index 1fcf3903b13..13bc9d3d916 100644
--- a/nixos/tests/dnscrypt-proxy.nix
+++ b/nixos/tests/dnscrypt-proxy.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: {
     # A client running the recommended setup: DNSCrypt proxy as a forwarder
     # for a caching DNS client.
     client =
-    { config, pkgs, ... }:
+    { ... }:
     let localProxyPort = 43; in
     {
       security.apparmor.enable = true;
diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix
index 38d25daff19..b306c149be9 100644
--- a/nixos/tests/docker-edge.nix
+++ b/nixos/tests/docker-edge.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     docker =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
         {
           virtualisation.docker.enable = true;
           virtualisation.docker.package = pkgs.docker-edge;
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index 1fbd199c7bc..8936421072a 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    registry = { config, pkgs, ... }: {
+    registry = { ... }: {
       services.dockerRegistry.enable = true;
       services.dockerRegistry.enableDelete = true;
       services.dockerRegistry.port = 8080;
@@ -16,12 +16,12 @@ import ./make-test.nix ({ pkgs, ...} : {
       networking.firewall.allowedTCPPorts = [ 8080 ];
     };
 
-    client1 = { config, pkgs, ...}: {
+    client1 = { ... }: {
       virtualisation.docker.enable = true;
       virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
     };
 
-    client2 = { config, pkgs, ...}: {
+    client2 = { ... }: {
       virtualisation.docker.enable = true;
       virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
     };
diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix
index 9d7fa3e7a8c..637957bd3e8 100644
--- a/nixos/tests/docker-tools-overlay.nix
+++ b/nixos/tests/docker-tools-overlay.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ... }:
 
   nodes = {
     docker =
-      { config, pkgs, ... }:
+      { ... }:
       {
         virtualisation.docker.enable = true;
         virtualisation.docker.storageDriver = "overlay";  # defaults to overlay2
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index e2bcfbbd1f9..db4eacc3728 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
   nodes = {
     docker =
-      { config, pkgs, ... }: {
+      { ... }: {
         virtualisation = {
           diskSize = 2048;
           docker.enable = true;
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index c6c8f4cdb5f..d67b2f8743d 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     docker =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
         {
           virtualisation.docker.enable = true;
           virtualisation.docker.package = pkgs.docker;
diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix
index 041be0f5a62..3f02cecb866 100644
--- a/nixos/tests/ecryptfs.nix
+++ b/nixos/tests/ecryptfs.nix
@@ -1,8 +1,8 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test.nix ({ ... }:
 {
   name = "ecryptfs";
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     imports = [ ./common/user-account.nix ];
     boot.kernelModules = [ "ecryptfs" ];
     security.pam.enableEcryptfs = true;
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index ed656b3628b..8dba7a905fa 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -11,7 +11,7 @@ let
     };
     nodes = {
       one =
-        { config, pkgs, ... }: {
+        { pkgs, ... }: {
             # Not giving the machine at least 2060MB results in elasticsearch failing with the following error:
             #
             #   OpenJDK 64-Bit Server VM warning:
diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix
index 466e772a881..3594e35e343 100644
--- a/nixos/tests/emacs-daemon.nix
+++ b/nixos/tests/emacs-daemon.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   enableOCR = true;
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
 
     { imports = [ ./common/x11.nix ];
       services.emacs = {
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
index c6b0424e97b..064c498204a 100644
--- a/nixos/tests/env.nix
+++ b/nixos/tests/env.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ nequissimus ];
   };
 
-  machine = { config, lib, pkgs, ... }:
+  machine = { pkgs, ... }:
     {
       boot.kernelPackages = pkgs.linuxPackages;
       environment.etc."plainFile".text = ''
diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix
index 3971997a9bf..3c4de5950a7 100644
--- a/nixos/tests/etcd-cluster.nix
+++ b/nixos/tests/etcd-cluster.nix
@@ -102,7 +102,7 @@ in {
   };
 
   nodes = {
-    node1 = { config, pkgs, nodes, ... }: {
+    node1 = { ... }: {
       require = [nodeConfig];
       services.etcd = {
         initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"];
@@ -110,7 +110,7 @@ in {
       };
     };
 
-    node2 = { config, pkgs, ... }: {
+    node2 = { ... }: {
       require = [nodeConfig];
       services.etcd = {
         initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"];
@@ -118,7 +118,7 @@ in {
       };
     };
 
-    node3 = { config, pkgs, ... }: {
+    node3 = { ... }: {
       require = [nodeConfig];
       services.etcd = {
         initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"];
diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix
index f8a6791a834..6c23b31779b 100644
--- a/nixos/tests/etcd.nix
+++ b/nixos/tests/etcd.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   };
 
   nodes = {
-    node = { config, pkgs, nodes, ... }: {
+    node = { ... }: {
       services.etcd.enable = true;
     };
   };
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index bb7daae118c..24b74df85ad 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes =
     { client =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         with pkgs.lib;
         {
           networking = {
@@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : {
           };
       };
       server =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         with pkgs.lib;
         {
           networking = {
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index e1b628c9144..58a80243ea9 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
       environment.systemPackages = [ pkgs.firefox pkgs.xdotool ];
diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index 1119a5312eb..7207a880d8e 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ( { pkgs, ... } : {
 
   nodes =
     { walled =
-        { config, pkgs, nodes, ... }:
+        { ... }:
         { networking.firewall.enable = true;
           networking.firewall.logRefusedPackets = true;
           services.httpd.enable = true;
@@ -20,13 +20,13 @@ import ./make-test.nix ( { pkgs, ... } : {
       # original walled configuration so that there is a change in the service
       # file.
       walled2 =
-        { config, pkgs, nodes, ... }:
+        { ... }:
         { networking.firewall.enable = true;
           networking.firewall.rejectPackets = true;
         };
 
       attacker =
-        { config, pkgs, ... }:
+        { ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
           networking.firewall.enable = false;
diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix
index 7f27903a302..fb66fe28209 100644
--- a/nixos/tests/flannel.nix
+++ b/nixos/tests/flannel.nix
@@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
       networking.firewall.allowedUDPPorts = [ 8472 ];
     };
   in {
-    etcd = { config, pkgs, ... }: {
+    etcd = { ... }: {
       services = {
         etcd = {
           enable = true;
@@ -31,11 +31,11 @@ import ./make-test.nix ({ pkgs, ...} : rec {
       networking.firewall.allowedTCPPorts = [ 2379 ];
     };
 
-    node1 = { config, ... }: {
+    node1 = { ... }: {
       require = [flannelConfig];
     };
 
-    node2 = { config, ... }: {
+    node2 = { ... }: {
       require = [flannelConfig];
     };
   };
diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix
index 9a5bdf07021..096b37e6e2c 100644
--- a/nixos/tests/flatpak.nix
+++ b/nixos/tests/flatpak.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }:
     maintainers = pkgs.flatpak.meta.maintainers;
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     imports = [ ./common/x11.nix ];
     services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work
     environment.gnome3.excludePackages = pkgs.gnome3.optionalPackages;
diff --git a/nixos/tests/fwupd.nix b/nixos/tests/fwupd.nix
index bf4ef25130b..2e64149b2db 100644
--- a/nixos/tests/fwupd.nix
+++ b/nixos/tests/fwupd.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: {
     maintainers = pkgs.fwupd.meta.maintainers;
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     services.fwupd.enable = true;
     environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
     environment.variables.XDG_DATA_DIRS = [ "${pkgs.fwupd.installedTests}/share" ];
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 7268636b62a..3af2cbcd098 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    gitlab = { config, pkgs, ... }: {
+    gitlab = { ... }: {
       virtualisation.memorySize = 768;
 
       services.nginx = {
diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix
index d4028efad1d..690e456ed7c 100644
--- a/nixos/tests/gitolite.nix
+++ b/nixos/tests/gitolite.nix
@@ -58,7 +58,7 @@ in
   nodes = {
 
     server =
-      { config, pkgs, lib, ... }:
+      { ... }:
       {
         services.gitolite = {
           enable = true;
@@ -68,7 +68,7 @@ in
       };
 
     client =
-      { config, pkgs, lib, ... }:
+      { pkgs, ... }:
       {
         environment.systemPackages = [ pkgs.git ];
         programs.ssh.extraConfig = ''
diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
index 71ae1709d52..1f590f337fd 100644
--- a/nixos/tests/gnome3-gdm.nix
+++ b/nixos/tests/gnome3-gdm.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
 
     { imports = [ ./common/user-account.nix ];
 
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 591ed860068..3f51d04163a 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
 
     { imports = [ ./common/user-account.nix ];
 
diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix
index 5cadff08995..50470379576 100644
--- a/nixos/tests/gocd-agent.nix
+++ b/nixos/tests/gocd-agent.nix
@@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     gocd_agent =
-      { config, pkgs, ... }:
+      { ... }:
       {
         virtualisation.memorySize = 2046;
         services.gocd-agent = {
diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix
index b473d4ad61c..80cf04ed640 100644
--- a/nixos/tests/gocd-server.nix
+++ b/nixos/tests/gocd-server.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} :
 
 nodes = {
   gocd_server =
-    { config, pkgs, ... }:
+    { ... }:
     {
       virtualisation.memorySize = 2046;
       services.gocd-server.enable = true;
diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix
index d45776c3ee2..9dc765a879b 100644
--- a/nixos/tests/grafana.nix
+++ b/nixos/tests/grafana.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ lib, ... }:
     maintainers = [ willibutz ];
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     services.grafana = {
       enable = true;
       addr = "localhost";
diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix
index 5a1f50bd29b..1fe4357191e 100644
--- a/nixos/tests/graphite.nix
+++ b/nixos/tests/graphite.nix
@@ -1,9 +1,9 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test.nix ({ ... } :
 {
   name = "graphite";
   nodes = {
     one =
-      { config, pkgs, ... }: {
+      { ... }: {
         virtualisation.memorySize = 1024;
         time.timeZone = "UTC";
         services.graphite = {
diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix
index 4206c940c1a..e7d72a56e1e 100644
--- a/nixos/tests/hadoop/hdfs.nix
+++ b/nixos/tests/hadoop/hdfs.nix
@@ -1,6 +1,6 @@
-import ../make-test.nix ({pkgs, ...}: {
+import ../make-test.nix ({...}: {
   nodes = {
-    namenode = {pkgs, config, ...}: {
+    namenode = {pkgs, ...}: {
       services.hadoop = {
         package = pkgs.hadoop_3_1;
         hdfs.namenode.enabled = true;
@@ -18,7 +18,7 @@ import ../make-test.nix ({pkgs, ...}: {
         8020 # namenode.rpc-address
       ];
     };
-    datanode = {pkgs, config, ...}: {
+    datanode = {pkgs, ...}: {
       services.hadoop = {
         package = pkgs.hadoop_3_1;
         hdfs.datanode.enabled = true;
diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix
index e97cc1acc90..031592301f1 100644
--- a/nixos/tests/hadoop/yarn.nix
+++ b/nixos/tests/hadoop/yarn.nix
@@ -1,6 +1,6 @@
-import ../make-test.nix ({pkgs, ...}: {
+import ../make-test.nix ({...}: {
   nodes = {
-    resourcemanager = {pkgs, config, ...}: {
+    resourcemanager = {pkgs, ...}: {
       services.hadoop.package = pkgs.hadoop_3_1;
       services.hadoop.yarn.resourcemanager.enabled = true;
       services.hadoop.yarnSite = {
@@ -11,7 +11,7 @@ import ../make-test.nix ({pkgs, ...}: {
         8031 # resourcemanager.resource-tracker.address
       ];
     };
-    nodemanager = {pkgs, config, ...}: {
+    nodemanager = {pkgs, ...}: {
       services.hadoop.package = pkgs.hadoop_3_1;
       services.hadoop.yarn.nodemanager.enabled = true;
       services.hadoop.yarnSite = {
diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix
index 40548f34690..6277ebb4933 100644
--- a/nixos/tests/haka.nix
+++ b/nixos/tests/haka.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     haka =
-      { config, pkgs, ... }:
+      { ... }:
         {
           services.haka.enable = true;
         };
diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix
index ce4094237db..22a83e9d1ea 100644
--- a/nixos/tests/haproxy.nix
+++ b/nixos/tests/haproxy.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix ({ pkgs, ...}: {
   name = "haproxy";
   nodes = {
-    machine = { config, ...}: {
+    machine = { ... }: {
       imports = [ ../modules/profiles/minimal.nix ];
       services.haproxy = {
         enable = true;
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 0a0639d6279..2700b8e5935 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, lib, pkgs, ... }:
+    { lib, pkgs, ... }:
     with lib;
     { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; };
       users.users.sybil = { isNormalUser = true; group = "wheel"; };
diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index 3ae2bdffed9..1f98bb739f2 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -16,7 +16,7 @@ import ./make-test.nix (pkgs: {
       systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k";
     };
 
-    probe = { config, lib, pkgs, ...}: {
+    probe = { pkgs, ...}: {
       environment.systemPackages = [ pkgs.netcat ];
     };
   };
diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix
index b024306cde5..cb24c4dcffc 100644
--- a/nixos/tests/hitch/default.nix
+++ b/nixos/tests/hitch/default.nix
@@ -4,7 +4,7 @@ import ../make-test.nix ({ pkgs, ... }:
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ jflanglois ];
   };
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     environment.systemPackages = [ pkgs.curl ];
     services.hitch = {
       enable = true;
diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix
index 12c58a01224..78343f0e02f 100644
--- a/nixos/tests/hocker-fetchdocker/machine.nix
+++ b/nixos/tests/hocker-fetchdocker/machine.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 { nixpkgs.config.packageOverrides = pkgs': {
     hello-world-container = pkgs'.callPackage ./hello-world-container.nix { };
   };
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 797706a062c..0c027eaca61 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -12,7 +12,7 @@ in {
 
   nodes = {
     hass =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
       {
         environment.systemPackages = with pkgs; [
           mosquitto
diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix
index 82fd44e8e36..f21c0ad58a8 100644
--- a/nixos/tests/hound.nix
+++ b/nixos/tests/hound.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ grahamc ];
   };
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     services.hound = {
       enable = true;
       config = ''
diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix
index 74919444c16..98d99811f3c 100644
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@@ -31,7 +31,7 @@ in {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     {
       virtualisation.memorySize = 1024;
diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix
index 4685992d7a0..245c17eedf7 100644
--- a/nixos/tests/i3wm.nix
+++ b/nixos/tests/i3wm.nix
@@ -4,14 +4,14 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ aszlig ];
   };
 
-  machine = { lib, pkgs, ... }: {
+  machine = { lib, ... }: {
     imports = [ ./common/x11.nix ./common/user-account.nix ];
     services.xserver.displayManager.auto.user = "alice";
     services.xserver.windowManager.default = lib.mkForce "i3";
     services.xserver.windowManager.i3.enable = true;
   };
 
-  testScript = { nodes, ... }: ''
+  testScript = { ... }: ''
     $machine->waitForX;
     $machine->waitForFile("/home/alice/.Xauthority");
     $machine->succeed("xauth merge ~alice/.Xauthority");
diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix
index ee126091667..440049d9511 100644
--- a/nixos/tests/influxdb.nix
+++ b/nixos/tests/influxdb.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    one = { config, pkgs, ... }: {
+    one = { ... }: {
       services.influxdb.enable = true;
     };
   };
diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix
index b1f3d147e86..b2209f297a4 100644
--- a/nixos/tests/initrd-network-ssh/default.nix
+++ b/nixos/tests/initrd-network-ssh/default.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, lib, ... }:
+import ../make-test.nix ({ lib, ... }:
 
 {
   name = "initrd-network-ssh";
@@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, lib, ... }:
 
   nodes = with lib; rec {
     server =
-      { config, pkgs, ... }:
+      { config, ... }:
       {
         boot.kernelParams = [
           "ip=${config.networking.primaryIPAddress}:::255.255.255.0::eth1:none"
@@ -33,7 +33,7 @@ import ../make-test.nix ({ pkgs, lib, ... }:
       };
 
     client =
-      { config, pkgs, ... }:
+      { config, ... }:
       {
         environment.etc.knownHosts = {
           text = concatStrings [
diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix
index db9f572d3c2..ed9b82e2da7 100644
--- a/nixos/tests/initrd-network.nix
+++ b/nixos/tests/initrd-network.nix
@@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ];
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     imports = [ ../modules/profiles/minimal.nix ];
     boot.initrd.network.enable = true;
     boot.initrd.network.postCommands =
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 96230940e87..2455b9152bd 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -203,7 +203,7 @@ let
 
         # The configuration of the machine used to run "nixos-install".
         machine =
-          { config, lib, pkgs, ... }:
+          { pkgs, ... }:
 
           { imports =
               [ ../modules/profiles/installation-device.nix
diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix
index c6bc6154524..3cff7e99ff8 100644
--- a/nixos/tests/ipfs.nix
+++ b/nixos/tests/ipfs.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     adder =
-      { config, pkgs, ... }:
+      { ... }:
       {
         services.ipfs = {
           enable = true;
@@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : {
         networking.firewall.allowedTCPPorts = [ 4001 ];
       };
     getter =
-      { config, pkgs, ... }:
+      { ... }:
       {
         services.ipfs = {
           enable = true;
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 7a98fd85cfd..97f348a9bee 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -8,17 +8,17 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes =
-    { client = { config, pkgs, ... }: { };
+    { client = { ... }: { };
 
       server =
-        { config, pkgs, ... }:
+        { ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
           networking.firewall.allowedTCPPorts = [ 80 ];
         };
 
       router =
-        { config, pkgs, ... }:
+        { ... }:
         { services.radvd.enable = true;
           services.radvd.config =
             ''
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 25629efbfa4..4f2d2085cd1 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   nodes = {
 
     master =
-      { config, pkgs, ... }:
+      { ... }:
       { services.jenkins.enable = true;
 
         # should have no effect
@@ -24,7 +24,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
 
     slave =
-      { config, pkgs, ... }:
+      { ... }:
       { services.jenkinsSlave.enable = true;
 
         users.users.jenkins.extraGroups = [ "users" ];
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index e48b25d67df..c9fd74620ef 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -10,7 +10,7 @@ let
     };
 
     nodes = {
-      zookeeper1 = { config, ... }: {
+      zookeeper1 = { ... }: {
         services.zookeeper = {
           enable = true;
         };
@@ -18,7 +18,7 @@ let
         networking.firewall.allowedTCPPorts = [ 2181 ];
         virtualisation.memorySize = 1024;
       };
-      kafka = { config, ... }: {
+      kafka = { ... }: {
         services.apache-kafka = {
           enable = true;
           extraProperties = ''
diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix
index aa133c9b0aa..652fbf05537 100644
--- a/nixos/tests/kernel-copperhead.nix
+++ b/nixos/tests/kernel-copperhead.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ nequissimus ];
   };
 
-  machine = { config, lib, pkgs, ... }:
+  machine = { pkgs, ... }:
     {
       boot.kernelPackages = pkgs.linuxPackages_copperhead_lts;
     };
diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix
index 1350426654d..f30bd2e2e76 100644
--- a/nixos/tests/kernel-latest.nix
+++ b/nixos/tests/kernel-latest.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ nequissimus ];
   };
 
-  machine = { config, lib, pkgs, ... }:
+  machine = { pkgs, ... }:
     {
       boot.kernelPackages = pkgs.linuxPackages_latest;
     };
diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix
index 2aab4ce0b49..28717fa6a84 100644
--- a/nixos/tests/kernel-lts.nix
+++ b/nixos/tests/kernel-lts.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ nequissimus ];
   };
 
-  machine = { config, lib, pkgs, ... }:
+  machine = { pkgs, ... }:
     {
       boot.kernelPackages = pkgs.linuxPackages;
     };
diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix
index 0f5ddef7b1a..db596189d46 100644
--- a/nixos/tests/kexec.nix
+++ b/nixos/tests/kexec.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ eelco chaoflow ];
   };
 
-  machine = { config, pkgs, ... }:
+  machine = { ... }:
     { virtualisation.vlans = [ ]; };
 
   testScript =
diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix
index 980b3e762dc..7d7926309c9 100644
--- a/nixos/tests/krb5/deprecated-config.nix
+++ b/nixos/tests/krb5/deprecated-config.nix
@@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }: {
+    { ... }: {
       krb5 = {
         enable = true;
         defaultRealm = "ATHENA.MIT.EDU";
diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix
index d5328720931..f01cf6988ee 100644
--- a/nixos/tests/krb5/example-config.nix
+++ b/nixos/tests/krb5/example-config.nix
@@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }: {
+    { pkgs, ... }: {
       krb5 = {
         enable = true;
         kerberos = pkgs.krb5Full;
diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix
index 520c728b65e..85e92f6330c 100644
--- a/nixos/tests/kubernetes/certs.nix
+++ b/nixos/tests/kubernetes/certs.nix
@@ -1,9 +1,9 @@
 {
   pkgs ? import <nixpkgs> {},
-  internalDomain ? "cloud.yourdomain.net",
   externalDomain ? "myawesomecluster.cluster.yourdomain.net",
   serviceClusterIp ? "10.0.0.1",
-  kubelets
+  kubelets,
+  ...
 }:
 let
    runWithCFSSL = name: cmd:
diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix
index 8c488d271bc..30e1acd255a 100644
--- a/nixos/tests/kubernetes/dns.nix
+++ b/nixos/tests/kubernetes/dns.nix
@@ -60,7 +60,7 @@ let
     config.Entrypoint = "/bin/tail";
   };
 
-  extraConfiguration = { config, pkgs, lib, nodes, ... }: {
+  extraConfiguration = { config, pkgs, ... }: {
     environment.systemPackages = [ pkgs.bind.host ];
     # virtualisation.docker.extraOptions = "--dns=${config.services.kubernetes.addons.dns.clusterIp}";
     services.dnsmasq.enable = true;
diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix
index b39f4124c95..035a8192417 100644
--- a/nixos/tests/ldap.nix
+++ b/nixos/tests/ldap.nix
@@ -37,7 +37,7 @@ let
     memberUid: ${ldapUser}
   '';
   mkClient = useDaemon:
-    { config, pkgs, lib, ... }:
+    { lib, ... }:
     {
       virtualisation.memorySize = 256;
       virtualisation.vlans = [ 1 ];
@@ -61,7 +61,7 @@ in
   nodes = {
 
     server =
-      { config, pkgs, lib, ... }:
+      { pkgs, ... }:
       {
         virtualisation.memorySize = 256;
         virtualisation.vlans = [ 1 ];
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index d2b561fa67b..8a9a7408d29 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ aszlig ];
   };
 
-  machine = { lib, ... }: {
+  machine = { ... }: {
     imports = [ ./common/user-account.nix ];
     services.xserver.enable = true;
     services.xserver.displayManager.lightdm.enable = true;
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index a6a460fb0a7..3dbb494b689 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
   };
 
   machine =
-    { config, pkgs, lib, ... }:
+    { pkgs, lib, ... }:
     { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
     };
 
diff --git a/nixos/tests/mathics.nix b/nixos/tests/mathics.nix
index 310b751b4d8..fcbeeb18a72 100644
--- a/nixos/tests/mathics.nix
+++ b/nixos/tests/mathics.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   };
 
   nodes = {
-    machine = { config, pkgs, ... }: {
+    machine = { ... }: {
       services.mathics.enable = true;
       services.mathics.port = 8888;
     };
diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix
index f9ef3647bd1..b120599c51d 100644
--- a/nixos/tests/memcached.nix
+++ b/nixos/tests/memcached.nix
@@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     machine =
-      { config, pkgs, ... }:
+      { ... }:
       {
         imports = [ ../modules/profiles/minimal.nix ];
         services.memcached.enable = true;
diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
index 007d7ac2160..3ceb1d8125b 100644
--- a/nixos/tests/mesos.nix
+++ b/nixos/tests/mesos.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
   };
 
   nodes = {
-    master = { config, pkgs, ... }: {
+    master = { ... }: {
       networking.firewall.enable = false;
       services.zookeeper.enable = true;
       services.mesos.master = {
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
       };
     };
 
-    slave = { config, pkgs, ... }: {
+    slave = { ... }: {
       networking.firewall.enable = false;
       networking.nat.enable = true;
       virtualisation.docker.enable = true;
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index 07a292a9baa..40a59954665 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    machine = { config, pkgs, ... }: {
+    machine = { pkgs, ... }: {
       services.minio = {
         enable = true;
         accessKey = "BKIKJAA5BMMU2RHO6IBB";
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 179c95e7643..b0bc1d083b1 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
   foo = pkgs.writeText "foo" "Hello World";
 
   machine =
-    { config, lib, pkgs, ... }:
+    { lib, ... }:
     with lib;
     { swapDevices = mkOverride 0
         [ { device = "/root/swapfile"; size = 128; } ];
diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index 18535f51af9..2f380ff543e 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -13,7 +13,7 @@ in {
 
   nodes = {
     one =
-      { config, pkgs, ... }:
+      { ... }:
         {
           services = {
            mongodb.enable = true;
diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix
index 0a5324259ad..eab123bd50f 100644
--- a/nixos/tests/morty.nix
+++ b/nixos/tests/morty.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ... }:
   nodes =
     { mortyProxyWithKey =
 
-      { config, pkgs, ... }:
+      { ... }:
       { services.morty = {
         enable = true;
 	key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
@@ -20,7 +20,7 @@ import ./make-test.nix ({ pkgs, ... }:
     };
 
   testScript =
-    { nodes , ... }:
+    { ... }:
     ''
       $mortyProxyWithKey->waitForUnit("default.target");
 
diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix
index 2950a8d809d..ac2b810defe 100644
--- a/nixos/tests/mpd.nix
+++ b/nixos/tests/mpd.nix
@@ -47,10 +47,10 @@ import ./make-test.nix ({ pkgs, ... }:
 
   nodes =
     { client = 
-      { config, pkgs, ... }: { };
+      { ... }: { };
 
       serverALSA =
-        { config, pkgs, ... }: (mkServer {
+        { ... }: (mkServer {
           mpd = defaultMpdCfg // {
             network.listenAddress = "any";
             extraConfig = ''
@@ -66,7 +66,7 @@ import ./make-test.nix ({ pkgs, ... }:
         }) // { networking.firewall.allowedTCPPorts = [ 6600 ]; };
 
       serverPulseAudio =
-        { config, pkgs, ... }: (mkServer {
+        { ... }: (mkServer {
           mpd = defaultMpdCfg // {
             extraConfig = ''
               audio_output {
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 7959b85a0cf..8146453bfd5 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix ({ pkgs, ...} : 
 
 let
-  client = { config, pkgs, ... }: {
+  client = { pkgs, ... }: {
     imports = [ ./common/x11.nix ];
     environment.systemPackages = [ pkgs.mumble ];
   };
@@ -13,7 +13,7 @@ in
   };
 
   nodes = {
-    server = { config, pkgs, ... }: {
+    server = { config, ... }: {
       services.murmur.enable       = true;
       services.murmur.registerName = "NixOS tests";
       networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 40fafc62514..eb91d4d630b 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     one =
-      { config, pkgs, ... }:
+      { config, ... }:
         {
           services = {
            munin-node.enable = true;
diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix
index 4f11a4b8366..e590703ab2f 100644
--- a/nixos/tests/mutable-users.nix
+++ b/nixos/tests/mutable-users.nix
@@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    machine = { config, lib, pkgs, ... }: {
+    machine = { ... }: {
       users.mutableUsers = false;
     };
-    mutable = { config, lib, pkgs, ... }: {
+    mutable = { ... }: {
       users.mutableUsers = true;
     };
   };
diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix
index ff365098883..81482dfef7e 100644
--- a/nixos/tests/mysql-backup.nix
+++ b/nixos/tests/mysql-backup.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : {
   };
 
   nodes = {
-    master = { config, pkgs, ... }: {
+    master = { pkgs, ... }: {
       services.mysql = {
         enable = true;
         initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index ed09ac10b75..84d70cf3524 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -13,7 +13,7 @@ in
 
   nodes = {
     master =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       {
         services.mysql.enable = true;
@@ -27,7 +27,7 @@ in
       };
 
     slave1 =
-      { pkgs, config, nodes, ... }:
+      { pkgs, nodes, ... }:
 
       {
         services.mysql.enable = true;
@@ -40,7 +40,7 @@ in
       };
 
     slave2 =
-      { pkgs, config, nodes, ... }:
+      { pkgs, nodes, ... }:
 
       {
         services.mysql.enable = true;
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index c18fee6c749..7251c4a8649 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     master =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       {
         services.mysql.enable = true;
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 7057158a829..9c280fe8b5b 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
 
     nodes =
       { client =
-          { config, pkgs, nodes, ... }:
+          { pkgs, nodes, ... }:
           lib.mkMerge [
             { virtualisation.vlans = [ 1 ];
               networking.firewall.allowPing = true;
@@ -44,19 +44,19 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
           ];
 
         router =
-        { config, pkgs, ... }: lib.mkMerge [
+        { ... }: lib.mkMerge [
           routerBase
           { networking.nat.enable = true; }
         ];
 
         routerDummyNoNat =
-        { config, pkgs, ... }: lib.mkMerge [
+        { ... }: lib.mkMerge [
           routerBase
           { networking.nat.enable = false; }
         ];
 
         server =
-          { config, pkgs, ... }:
+          { ... }:
           { virtualisation.vlans = [ 2 ];
             networking.firewall.enable = false;
             services.httpd.enable = true;
diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix
index 58733c1b337..c56506ba287 100644
--- a/nixos/tests/netdata.nix
+++ b/nixos/tests/netdata.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     netdata =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
         {
           environment.systemPackages = with pkgs; [ curl jq ];
           services.netdata.enable = true;
diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix
index 4c572573140..ab908c96e5e 100644
--- a/nixos/tests/networking-proxy.nix
+++ b/nixos/tests/networking-proxy.nix
@@ -19,13 +19,13 @@ in import ./make-test.nix ({ pkgs, ...} : {
   nodes = {
     # no proxy
     machine =
-      { config, pkgs, ... }:
+      { ... }:
 
       default-config;
 
     # proxy default
     machine2 =
-      { config, pkgs, ... }:
+      { ... }:
 
       default-config // {
         networking.proxy.default = "http://user:pass@host:port";
@@ -33,7 +33,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
 
     # specific proxy options
     machine3 =
-      { config, pkgs, ... }:
+      { ... }:
 
       default-config //
       {
@@ -51,7 +51,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
 
     # mix default + proxy options
     machine4 =
-      { config, pkgs, ... }:
+      { ... }:
 
       default-config // {
         networking.proxy = {
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 5cb40af5799..cd5d537a3be 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -81,7 +81,7 @@ let
     static = {
       name = "Static";
       nodes.router = router;
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -98,7 +98,7 @@ let
           ];
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -134,7 +134,7 @@ let
     dhcpSimple = {
       name = "SimpleDHCP";
       nodes.router = router;
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -150,7 +150,7 @@ let
           };
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -189,7 +189,7 @@ let
     dhcpOneIf = {
       name = "OneInterfaceDHCP";
       nodes.router = router;
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -202,7 +202,7 @@ let
           interfaces.eth2.ipv4.addresses = mkOverride 0 [ ];
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -229,7 +229,7 @@ let
         '';
     };
     bond = let
-      node = address: { config, pkgs, ... }: with pkgs.lib; {
+      node = address: { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -249,7 +249,7 @@ let
       name = "Bond";
       nodes.client1 = node "192.168.1.1";
       nodes.client2 = node "192.168.1.2";
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -266,7 +266,7 @@ let
         '';
     };
     bridge = let
-      node = { address, vlan }: { config, pkgs, ... }: with pkgs.lib; {
+      node = { address, vlan }: { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ vlan ];
         networking = {
           useNetworkd = networkd;
@@ -280,7 +280,7 @@ let
       name = "Bridge";
       nodes.client1 = node { address = "192.168.1.2"; vlan = 1; };
       nodes.client2 = node { address = "192.168.1.3"; vlan = 2; };
-      nodes.router = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.router = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -293,7 +293,7 @@ let
             [ { address = "192.168.1.1"; prefixLength = 24; } ];
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -319,7 +319,7 @@ let
     macvlan = {
       name = "MACVLAN";
       nodes.router = router;
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -329,7 +329,7 @@ let
           interfaces.eth1.ipv4.addresses = mkOverride 0 [ ];
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -356,7 +356,7 @@ let
         '';
     };
     sit = let
-      node = { address4, remote, address6 }: { config, pkgs, ... }: with pkgs.lib; {
+      node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -377,7 +377,7 @@ let
       name = "Sit";
       nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; };
       nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -398,7 +398,7 @@ let
         '';
     };
     vlan = let
-      node = address: { config, pkgs, ... }: with pkgs.lib; {
+      node = address: { pkgs, ... }: with pkgs.lib; {
         #virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -418,7 +418,7 @@ let
       name = "vlan";
       nodes.client1 = node "192.168.1.1";
       nodes.client2 = node "192.168.1.2";
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
@@ -476,7 +476,7 @@ let
     };
     privacy = {
       name = "Privacy";
-      nodes.router = { config, pkgs, ... }: {
+      nodes.router = { ... }: {
         virtualisation.vlans = [ 1 ];
         boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
         networking = {
@@ -502,7 +502,7 @@ let
           '';
         };
       };
-      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -514,7 +514,7 @@ let
           };
         };
       };
-      testScript = { nodes, ... }:
+      testScript = { ... }:
         ''
           startAll;
 
diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix
index be886201877..bf49d2247bd 100644
--- a/nixos/tests/nexus.nix
+++ b/nixos/tests/nexus.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   nodes = {
 
     server =
-      { config, pkgs, ... }:
+      { ... }:
       { virtualisation.memorySize = 2047; # qemu-system-i386 has a 2047M limit
         virtualisation.diskSize = 2048;
 
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 6ed1995f262..1992f240e7b 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, version ? 4, ... }:
 let
 
   client =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { fileSystems = pkgs.lib.mkVMOverride
         [ { mountPoint = "/data";
             device = "server:/data";
@@ -27,7 +27,7 @@ in
       client2 = client;
 
       server =
-        { config, pkgs, ... }:
+        { ... }:
         { services.nfs.server.enable = true;
           services.nfs.server.exports =
             ''
diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
index 7f7bc0f0b4f..32b11364923 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -10,7 +10,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     webserver =
-      { config, pkgs, ... }:
+      { ... }:
       { services.nginx.enable = true;
         services.nginx.commonHttpConfig = ''
         log_format ceeformat '@cee: {"status":"$status",'
diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix
index 21b86f6dae2..2b56aee0a2e 100644
--- a/nixos/tests/novacomd.nix
+++ b/nixos/tests/novacomd.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ dtzWill ];
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     services.novacomd.enable = true;
   };
 
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 230b4520684..c66b90b802d 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -11,7 +11,7 @@ in {
   nodes = {
 
     server =
-      { config, pkgs, ... }:
+      { ... }:
 
       {
         services.openssh.enable = true;
@@ -23,7 +23,7 @@ in {
       };
 
     server_lazy =
-      { config, pkgs, ... }:
+      { ... }:
 
       {
         services.openssh = { enable = true; startWhenNeeded = true; };
@@ -35,7 +35,7 @@ in {
       };
 
     client =
-      { config, pkgs, ... }: { };
+      { ... }: { };
 
   };
 
diff --git a/nixos/tests/owncloud.nix b/nixos/tests/owncloud.nix
index 0dcdea40b06..c968569f200 100644
--- a/nixos/tests/owncloud.nix
+++ b/nixos/tests/owncloud.nix
@@ -1,10 +1,10 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test.nix ({ ... }:
 
 {
   name = "owncloud";
   nodes =
     { web =
-        { config, pkgs, ... }:
+        { ... }:
         {
           services.postgresql.enable = true;
           services.httpd = {
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix
index 9f40ecfe865..b9d489950e7 100644
--- a/nixos/tests/pam-oath-login.nix
+++ b/nixos/tests/pam-oath-login.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
+import ./make-test.nix ({ ... }:
 
 let
   oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3";
@@ -22,7 +22,7 @@ in
   name = "pam-oath-login";
 
   machine =
-    { config, pkgs, lib, ... }:
+    { ... }:
     {
       security.pam.oath = {
         enable = true;
diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix
index 291d9b278d3..01a08995950 100644
--- a/nixos/tests/partition.nix
+++ b/nixos/tests/partition.nix
@@ -65,7 +65,7 @@ let
 in {
   name = "partitiion";
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     environment.systemPackages = [
       pkgs.pythonPackages.nixpart0
       pkgs.file pkgs.btrfs-progs pkgs.xfsprogs pkgs.lvm2
diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix
index eb729f22f91..fae37fedaac 100644
--- a/nixos/tests/peerflix.nix
+++ b/nixos/tests/peerflix.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     peerflix =
-      { config, pkgs, ... }:
+      { ... }:
         {
           services.peerflix.enable = true;
         };
diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix
index d186c42a2a9..a2d81288c81 100644
--- a/nixos/tests/pgjwt.nix
+++ b/nixos/tests/pgjwt.nix
@@ -14,7 +14,7 @@ with pkgs; {
   };
 
   nodes = {
-    master = { pkgs, config, ... }:
+    master = { ... }:
     {
       services.postgresql = {
         enable = true;
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
index fdc39393fae..20b3b838aba 100644
--- a/nixos/tests/phabricator.nix
+++ b/nixos/tests/phabricator.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
   nodes = {
     storage =
-      { config, pkgs, ... }:
+      { ... }:
       { services.nfs.server.enable = true;
         services.nfs.server.exports = ''
           /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     webserver =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
       { fileSystems = pkgs.lib.mkVMOverride
           [ { mountPoint = "/repos";
               device = "storage:/repos";
@@ -52,7 +52,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     client =
-      { config, pkgs, ... }:
+      { ... }:
       { imports = [ ./common/x11.nix ];
         services.xserver.desktopManager.plasma5.enable = true;
       };
diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix
index f618a39a229..19bde9babad 100644
--- a/nixos/tests/php-pcre.nix
+++ b/nixos/tests/php-pcre.nix
@@ -1,9 +1,9 @@
 
 let testString = "can-use-subgroups"; in
 
-import ./make-test.nix ({ pkgs, ...}: {
+import ./make-test.nix ({ ...}: {
   name = "php-httpd-pcre-jit-test";
-  machine = { config, lib, pkgs, ... }: {
+  machine = { lib, pkgs, ... }: {
     time.timeZone = "UTC";
     services.httpd = {
       enable = true;
@@ -34,7 +34,7 @@ import ./make-test.nix ({ pkgs, ...}: {
       };
     };
   };
-  testScript = { nodes, ... }:
+  testScript = { ... }:
   ''
     $machine->waitForUnit('httpd.service');
     # Ensure php evaluation by matching on the var_dump syntax
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index e479d3f1cb8..eb705536827 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} :
     maintainers = [ ttuegel ];
   };
 
-  machine = { lib, ... }:
+  machine = { ... }:
   let
     sddm_theme = pkgs.stdenv.mkDerivation {
       name = "breeze-ocr-theme";
diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix
index 9058c59c92d..609afe7b214 100644
--- a/nixos/tests/plotinus.nix
+++ b/nixos/tests/plotinus.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
       programs.plotinus.enable = true;
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 7fe905eb425..f8b63c5b6a2 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     master =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       {
         services.postgresql = let mypg = pkgs.postgresql100; in {
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 2381939552e..f1f09277f34 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -22,7 +22,7 @@ let
       maintainers = [ zagy ];
     };
 
-    machine = {pkgs, config, ...}:
+    machine = {...}:
       {
         services.postgresql.package=postgresql-package;
         services.postgresql.enable = true;
diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix
index 0d5b0f715f5..8addcc78401 100644
--- a/nixos/tests/powerdns.nix
+++ b/nixos/tests/powerdns.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix ({ pkgs, ... }: {
   name = "powerdns";
 
-  nodes.server = { config, pkgs, ... }: {
+  nodes.server = { ... }: {
     services.powerdns.enable = true;
   };
 
diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix
index 0b431034a7a..0d73436c1c3 100644
--- a/nixos/tests/predictable-interface-names.nix
+++ b/nixos/tests/predictable-interface-names.nix
@@ -9,7 +9,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
     name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}";
     meta = {};
 
-    machine = { config, lib, ... }: {
+    machine = { lib, ... }: {
       networking.usePredictableInterfaceNames = lib.mkForce predictable;
       networking.useNetworkd = withNetworkd;
       networking.dhcpcd.enable = !withNetworkd;
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 98900883061..d85abf3c105 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -9,7 +9,7 @@ import ./make-test.nix ({pkgs, ... }: {
   nodes = {
 
     server =
-      { config, pkgs, ... }:
+      { ... }:
       { services.printing.enable = true;
         services.printing.listenAddresses = [ "*:631" ];
         services.printing.defaultShared = true;
@@ -24,7 +24,7 @@ import ./make-test.nix ({pkgs, ... }: {
       };
 
     client =
-      { config, pkgs, nodes, ... }:
+      { ... }:
       { services.printing.enable = true;
       };
 
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix
index 374fb2d634b..87a6510f40f 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixos/tests/prometheus.nix
@@ -2,7 +2,7 @@ import ./make-test.nix {
   name = "prometheus";
 
   nodes = {
-    one = { config, pkgs, ... }: {
+    one = { ... }: {
       services.prometheus = {
         enable = true;
         scrapeConfigs = [{
diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix
index fcebfaf74e1..5d33aaf8d65 100644
--- a/nixos/tests/prosody.nix
+++ b/nixos/tests/prosody.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix {
   name = "prosody";
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     services.prosody = {
       enable = true;
       # TODO: use a self-signed certificate
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 3fee1d32538..18195312028 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} :
 let
 
   backend =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
@@ -21,7 +21,7 @@ in
 
   nodes =
     { proxy =
-        { config, pkgs, nodes, ... }:
+        { nodes, ... }:
 
         { services.httpd.enable = true;
           services.httpd.adminAddr = "bar@example.org";
@@ -57,7 +57,7 @@ in
       backend1 = backend;
       backend2 = backend;
 
-      client = { config, pkgs, ... }: { };
+      client = { ... }: { };
     };
 
   testScript =
diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix
index 613180942c4..0ff14a21584 100644
--- a/nixos/tests/quagga.nix
+++ b/nixos/tests/quagga.nix
@@ -30,14 +30,14 @@ import ./make-test.nix ({ pkgs, ... }:
       nodes = {
 
         client =
-          { config, pkgs, nodes, ... }:
+          { nodes, ... }:
           {
             virtualisation.vlans = [ 1 ];
             networking.defaultGateway = ifAddr nodes.router1 "eth1";
           };
 
         router1 =
-          { config, pkgs, nodes, ... }:
+          { ... }:
           {
             virtualisation.vlans = [ 1 2 ];
             boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
@@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, ... }:
           };
 
         router2 =
-          { config, pkgs, nodes, ... }:
+          { ... }:
           {
             virtualisation.vlans = [ 3 2 ];
             boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
@@ -61,7 +61,7 @@ import ./make-test.nix ({ pkgs, ... }:
           };
 
         server =
-          { config, pkgs, nodes, ... }:
+          { nodes, ... }:
           {
             virtualisation.vlans = [ 3 ];
             networking.defaultGateway = ifAddr nodes.router2 "eth1";
@@ -73,7 +73,7 @@ import ./make-test.nix ({ pkgs, ... }:
       };
 
       testScript =
-        { nodes, ... }:
+        { ... }:
         ''
           startAll;
 
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index 22d71595cb4..75c82cca63f 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -29,7 +29,7 @@ rec {
   #makeCoverageReport = true;
 
   client =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
       hardware.opengl.driSupport = true;
@@ -40,7 +40,7 @@ rec {
 
   nodes =
     { server =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
 
         { systemd.services."quake3-server" =
             { wantedBy = [ "multi-user.target" ];
diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix
index 23a7e2ed538..34ab0578786 100644
--- a/nixos/tests/rabbitmq.nix
+++ b/nixos/tests/rabbitmq.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   };
 
   nodes = {
-    one = { config, pkgs, ... }: {
+    one = { ... }: {
       services.rabbitmq.enable = true;
     };
   };
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index e3843038541..0a9c2d394a7 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -28,7 +28,7 @@ let
 
 in
 
-  import ./make-test.nix ({ pkgs, lib, ... }@args: {
+  import ./make-test.nix ({ lib, ... }@args: {
     name = "radicale";
     meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];
 
diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix
index 18d028232ac..68a9b7315b3 100644
--- a/nixos/tests/riak.nix
+++ b/nixos/tests/riak.nix
@@ -3,7 +3,7 @@ import ./make-test.nix {
 
   nodes = {
     master =
-      { pkgs, config, ... }:
+      { pkgs, ... }:
 
       {
         services.riak.enable = true;
diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index a6dfece44a9..bd90dc3080b 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
@@ -5,7 +5,7 @@ with import ../lib/testing.nix { inherit system; };
 let
   output = runInMachine {
     drv = pkgs.hello;
-    machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ };
+    machine = { ... }: { /* services.sshd.enable = true; */ };
   };
 in pkgs.runCommand "verify-output" { inherit output; } ''
   if [ ! -e "$output/bin/hello" ]; then
diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix
index cfe64a75a63..d0b53db8eeb 100644
--- a/nixos/tests/rxe.nix
+++ b/nixos/tests/rxe.nix
@@ -1,7 +1,7 @@
-import ./make-test.nix ({ pkgs, ... } :
+import ./make-test.nix ({ ... } :
 
 let
-  node = { config, pkgs, lib, ... } : {
+  node = { pkgs, ... } : {
     networking = {
       firewall = {
         allowedUDPPorts = [ 4791 ]; # open RoCE port
diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix
index e446284fc0e..2802e00a5b1 100644
--- a/nixos/tests/samba.nix
+++ b/nixos/tests/samba.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }:
 
   nodes =
     { client =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         { fileSystems = pkgs.lib.mkVMOverride
             { "/public" = {
                 fsType = "cifs";
@@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ... }:
         };
 
       server =
-        { config, pkgs, ... }:
+        { ... }:
         { services.samba.enable = true;
           services.samba.shares.public =
             { path = "/public";
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index ac91a89f669..7b9fdc0b344 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -9,7 +9,7 @@ let
     default = {
       name = "sddm";
 
-      machine = { lib, ... }: {
+      machine = { ... }: {
         imports = [ ./common/user-account.nix ];
         services.xserver.enable = true;
         services.xserver.displayManager.sddm.enable = true;
@@ -39,7 +39,7 @@ let
         maintainers = [ ttuegel ];
       };
 
-      machine = { lib, ... }: {
+      machine = { ... }: {
         imports = [ ./common/user-account.nix ];
         services.xserver.enable = true;
         services.xserver.displayManager.sddm = {
@@ -54,7 +54,7 @@ let
         services.xserver.desktopManager.default = "none";
       };
 
-      testScript = { nodes, ... }: ''
+      testScript = { ... }: ''
         startAll;
         $machine->waitForFile("/home/alice/.Xauthority");
         $machine->succeed("xauth merge ~alice/.Xauthority");
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index 04d624adcfe..84c5621d962 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ eelco ];
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     imports = [ ../modules/profiles/minimal.nix ];
   };
 
diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix
index 5c76c58cf3f..42c87dfa039 100644
--- a/nixos/tests/slim.nix
+++ b/nixos/tests/slim.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ aszlig ];
   };
 
-  machine = { pkgs, lib, ... }: {
+  machine = { pkgs, ... }: {
     imports = [ ./common/user-account.nix ];
     services.xserver.enable = true;
     services.xserver.windowManager.default = "icewm";
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index ec67ea09287..60f44c3c845 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test.nix ({ ... }:
 let mungekey = "mungeverryweakkeybuteasytointegratoinatest";
     slurmconfig = {
       controlMachine = "control";
@@ -14,7 +14,7 @@ in {
   nodes =
     let
     computeNode =
-      { config, pkgs, ...}:
+      { ...}:
       {
         # TODO slrumd port and slurmctld port should be configurations and
         # automatically allowed by the  firewall.
@@ -26,7 +26,7 @@ in {
     in {
 
     control =
-      { config, pkgs, ...}:
+      { ...}:
       {
         networking.firewall.enable = false;
         services.slurm = {
@@ -35,7 +35,7 @@ in {
       };
 
     submit =
-      { config, pkgs, ...}:
+      { ...}:
       {
         networking.firewall.enable = false;
         services.slurm = {
diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix
index 4c77e4b7861..07d22805112 100644
--- a/nixos/tests/smokeping.nix
+++ b/nixos/tests/smokeping.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     sm =
-      { pkgs, config, ... }:
+      { ... }:
       {
         services.smokeping = {
           enable = true;
diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix
index 021743021b4..8bbebd42300 100644
--- a/nixos/tests/strongswan-swanctl.nix
+++ b/nixos/tests/strongswan-swanctl.nix
@@ -34,7 +34,7 @@ in {
   meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ];
   nodes = {
 
-    alice = { nodes, ... } : {
+    alice = { ... } : {
       virtualisation.vlans = [ 0 ];
       networking = {
         dhcpcd.enable = false;
@@ -42,7 +42,7 @@ in {
       };
     };
 
-    moon = {pkgs, config, nodes, ...} :
+    moon = { config, ...} :
       let strongswan = config.services.strongswan-swanctl.package;
       in {
         virtualisation.vlans = [ 0 1 ];
@@ -94,7 +94,7 @@ in {
         };
       };
 
-    carol = {pkgs, config, nodes, ...} :
+    carol = { config, ...} :
       let strongswan = config.services.strongswan-swanctl.package;
       in {
         virtualisation.vlans = [ 1 ];
diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix
index a8e33a6f7e5..6175155cdfc 100644
--- a/nixos/tests/subversion.nix
+++ b/nixos/tests/subversion.nix
@@ -39,7 +39,7 @@ in
 
   nodes =
     { webserver =
-        { config, pkgs, ... }:
+        { ... }:
 
         {
           services.httpd.enable = true;
@@ -55,7 +55,7 @@ in
         };
 
       client =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
 
         {
           environment.systemPackages = [ pkgs.subversion ];
diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix
index 5d6c8691230..fc16b99cc19 100644
--- a/nixos/tests/sudo.nix
+++ b/nixos/tests/sudo.nix
@@ -11,7 +11,7 @@ in
     };
 
     machine =
-      { config, lib, pkgs, ... }:
+      { lib, ... }:
       with lib;
       {
         users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; };
diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix
index 46f2563af8d..32010838e67 100644
--- a/nixos/tests/switch-test.nix
+++ b/nixos/tests/switch-test.nix
@@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    machine = { config, lib, pkgs, ... }: {
+    machine = { ... }: {
       users.mutableUsers = false;
     };
-    other = { config, lib, pkgs, ... }: {
+    other = { ... }: {
       users.mutableUsers = true;
     };
   };
diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix
index 475c947e72d..af63c7ee8e0 100644
--- a/nixos/tests/tomcat.nix
+++ b/nixos/tests/tomcat.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   nodes = {
     server =
-      { pkgs, config, ... }:
+      { ... }:
 
       { services.tomcat.enable = true;
         services.httpd.enable = true;
diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix
index 24d46a03897..0cb44ddff24 100644
--- a/nixos/tests/tor.nix
+++ b/nixos/tests/tor.nix
@@ -5,14 +5,14 @@ rec {
   meta.maintainers = with maintainers; [ joachifm ];
 
   common =
-    { config, ... }:
+    { ... }:
     { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ];
       networking.firewall.enable = false;
       networking.useDHCP = false;
     };
 
   nodes.client =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
     { imports = [ common ];
       environment.systemPackages = with pkgs; [ netcat ];
       services.tor.enable = true;
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index 5da5717d7f8..4599885acde 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
   nodes = {
     storage =
-      { config, pkgs, ... }:
+      { ... }:
       { services.nfs.server.enable = true;
         services.nfs.server.exports = ''
           /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     postgresql =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
       { services.postgresql.enable = true;
         services.postgresql.package = pkgs.postgresql;
         services.postgresql.enableTCPIP = true;
@@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     webserver =
-      { config, pkgs, ... }:
+      { pkgs, ... }:
       { fileSystems = pkgs.lib.mkVMOverride
           [ { mountPoint = "/repos";
               device = "storage:/repos";
@@ -43,7 +43,7 @@ import ./make-test.nix ({ pkgs, ... }: {
       };
 
     client =
-      { config, pkgs, ... }:
+      { ... }:
       { imports = [ ./common/x11.nix ];
         services.xserver.desktopManager.plasma5.enable = true;
       };
diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix
index 34c49bd7f15..f1c238730eb 100644
--- a/nixos/tests/transmission.nix
+++ b/nixos/tests/transmission.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ coconnor ];
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { ... }: {
     imports = [ ../modules/profiles/minimal.nix ];
 
     networking.firewall.allowedTCPPorts = [ 9091 ];
diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix
index 70a999267a5..8bbbe286efc 100644
--- a/nixos/tests/udisks2.nix
+++ b/nixos/tests/udisks2.nix
@@ -16,7 +16,7 @@ in
   };
 
   machine =
-    { config, pkgs, ... }:
+    { ... }:
     { services.udisks2.enable = true;
       imports = [ ./common/user-account.nix ];
 
diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
index 515d5c8bac2..caf0cbb2abf 100644
--- a/nixos/tests/vault.nix
+++ b/nixos/tests/vault.nix
@@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... }:
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ lnl7 ];
   };
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     environment.systemPackages = [ pkgs.vault ];
     environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
     services.vault.enable = true;
diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix
index c51306a8c7a..2c0bbbfd716 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }:
 
   nodes =
     { web =
-        { config, pkgs, ... }:
+        { pkgs, ... }:
         {
           services.mysql = {
             enable = true;
@@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ... }:
     };
 
   testScript =
-    { nodes, ... }:
+    { ... }:
     ''
       startAll;
 
diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixos/tests/xdg-desktop-portal.nix
index d954b07f73d..79ebb83c49a 100644
--- a/nixos/tests/xdg-desktop-portal.nix
+++ b/nixos/tests/xdg-desktop-portal.nix
@@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }:
     maintainers = pkgs.xdg-desktop-portal.meta.maintainers;
   };
 
-  machine = { config, pkgs, ... }: {
+  machine = { pkgs, ... }: {
     environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
   };
 
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index c8b18f12265..47717e8cf7d 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   machine =
-    { config, pkgs, ... }:
+    { pkgs, ... }:
 
     { imports = [ ./common/user-account.nix ];
 
diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix
index 3ea455c393c..61fa7c1a67d 100644
--- a/nixos/tests/xmonad.nix
+++ b/nixos/tests/xmonad.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     };
   };
 
-  testScript = { nodes, ... }: ''
+  testScript = { ... }: ''
     $machine->waitForX;
     $machine->waitForFile("/home/alice/.Xauthority");
     $machine->succeed("xauth merge ~alice/.Xauthority");
diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix
index c997e36cc44..0106aefe831 100644
--- a/nixos/tests/xrdp.nix
+++ b/nixos/tests/xrdp.nix
@@ -5,14 +5,14 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    server = { lib, pkgs, ... }: {
+    server = { pkgs, ... }: {
       imports = [ ./common/user-account.nix ];
       services.xrdp.enable = true;
       services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm";
       networking.firewall.allowedTCPPorts = [ 3389 ];
     };
 
-    client = { lib, pkgs, ... }: {
+    client = { pkgs, ... }: {
       imports = [ ./common/x11.nix ./common/user-account.nix ];
       services.xserver.displayManager.auto.user = "alice";
       environment.systemPackages = [ pkgs.freerdp ];
@@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     };
   };
 
-  testScript = { nodes, ... }: ''
+  testScript = { ... }: ''
     startAll;
 
     $client->waitForX;
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index a6908024de9..1434038e90c 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -17,7 +17,7 @@ let
         maintainers = [ adisbladis ];
       };
 
-      machine = { config, lib, pkgs, ... }:
+      machine = { pkgs, ... }:
         {
           virtualisation.emptyDiskImages = [ 4096 ];
           networking.hostId = "deadbeef";
diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix
index d247654adad..f343ebd39e4 100644
--- a/nixos/tests/zookeeper.nix
+++ b/nixos/tests/zookeeper.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   nodes = {
-    server = { pkgs, config, ... }: {
+    server = { ... }: {
       services.zookeeper = {
         enable = true;
       };
-- 
GitLab


From fbe71e9c4809b8df417ef86bf7bd2110152bb666 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 22:58:52 +0200
Subject: [PATCH 092/128] cinelerra: add version

see issue #43717
---
 pkgs/applications/video/cinelerra/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 4adbdbdadb2..cefabfbcab5 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -7,7 +7,7 @@
 , fontconfig, intltool }:
 
 stdenv.mkDerivation {
-  name = "cinelerra-git";
+  name = "cinelerra-unstable-2016-01-12";
 
   # # REGION AUTO UPDATE:    { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }
   # src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"
-- 
GitLab


From db697f016bb3eac254283af0405a25cf4538371b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 23:00:27 +0200
Subject: [PATCH 093/128] cinelerra: remove old commented code

---
 pkgs/applications/video/cinelerra/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index cefabfbcab5..07bbb829d22 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -9,21 +9,8 @@
 stdenv.mkDerivation {
   name = "cinelerra-unstable-2016-01-12";
 
-  # # REGION AUTO UPDATE:    { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }
-  # src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"
-  #              (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; });
-  # # END
-
   src = fetchgit {
     url = "git://git.cinelerra-cv.org/j6t/cinelerra.git";
-    # 2.3
-    #rev = "58ef118e63bf2fac8c99add372c584e93b008bae";
-    #sha256 = "1wx8c9rvh4y7fgg39lb02cy3sanms8a4fayr70jbhcb4rp691lph";
-    # master 22 nov 2016
-    #rev = "dbc22e0f35a9e8c274b06d4075b51dc9bace34aa";
-    #sha256 = "0c76j98ws1x2s5hzcdlykxm2bi7987d9nanka428xj62id0grla5";
-
-    # j6t/cinelerra.git
     rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4";
     sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r";
   };
-- 
GitLab


From a83b6f9cb32d802404eb8eca7b9eec1694822bef Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 23:04:39 +0200
Subject: [PATCH 094/128] frog: adhere to version schema convention

see issue #43717
---
 pkgs/development/libraries/languagemachines/frog.nix            | 2 +-
 .../release-info/LanguageMachines-frogdata.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix
index 853d23c9745..dcff8c2757e 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/development/libraries/languagemachines/frog.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   name = "frog-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
-                   name = "frog-${release.version}.tar.gz"; };
+                   name = "frog-v${release.version}.tar.gz"; };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
                   libxml2 icu
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
index 1147322be6d..6ea44938717 100644
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
+++ b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frogdata.json
@@ -1,5 +1,5 @@
 {
-  "version": "v0.13",
+  "version": "0.13",
   "url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13",
   "sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg"
 }
-- 
GitLab


From eca518109c10ad2b53ce2b470164c0424aa4f4ad Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 20 Jul 2018 23:07:16 +0200
Subject: [PATCH 095/128] hyper-haskell-server-with-packages: add version to
 name

see issue #43717
---
 pkgs/development/tools/haskell/hyper-haskell/server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix
index ff82127f0c4..47a9c550fa8 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/server.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix
@@ -3,7 +3,7 @@
 let
 hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self);
 in stdenv.mkDerivation {
-  name = "hyper-haskell-server-with-packages";
+  name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}";
 
   nativeBuildInputs = [ makeWrapper ];
 
-- 
GitLab


From 8993ddf8975f42ccb1b088c03b2ffda1a266b08f Mon Sep 17 00:00:00 2001
From: hcmensch <hcmensch@umich.edu>
Date: Fri, 20 Jul 2018 18:23:21 -0400
Subject: [PATCH 096/128] Update vim-plugin-names

---
 pkgs/misc/vim-plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 188d87f9484..9e7f70925a2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -110,6 +110,7 @@
 "github:lambdalisue/vim-gista"
 "github:latex-box-team/latex-box"
 "github:leafgarland/typescript-vim"
+"github:ledger/vim-ledger"
 "github:lepture/vim-jinja"
 "github:lervag/vimtex"
 "github:lfilho/cosco.vim"
-- 
GitLab


From f517b5a8ddcc73319f0dc531cf82d68c6204a500 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 20 Jul 2018 17:50:08 -0500
Subject: [PATCH 097/128] foundationdb: bump to 5.2.6, 6.0.2-prelease

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix         | 31 ++++++--
 .../{ldflags.patch => ldflags-5.2.patch}      |  0
 pkgs/servers/foundationdb/ldflags-6.0.patch   | 78 +++++++++++++++++++
 3 files changed, 101 insertions(+), 8 deletions(-)
 rename pkgs/servers/foundationdb/{ldflags.patch => ldflags-5.2.patch} (100%)
 create mode 100644 pkgs/servers/foundationdb/ldflags-6.0.patch

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index ecefc1d8fab..461b90bc978 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -53,7 +53,9 @@ let
         patches =
           [ # For 5.2+, we need a slightly adjusted patch to fix all the ldflags
             (if lib.versionAtLeast version "5.2"
-             then ./ldflags.patch
+             then (if lib.versionAtLeast version "6.0"
+                   then ./ldflags-6.0.patch
+                   else ./ldflags-5.2.patch)
              else ./ldflags-5.1.patch)
           ] ++
           # for 6.0+, we do NOT need to apply this version fix, since we can specify
@@ -77,10 +79,20 @@ let
             --replace 'exit 1' '#exit 1'
 
           patchShebangs .
+        '' + lib.optionalString (lib.versionAtLeast version "6.0") ''
+          substituteInPlace ./Makefile \
+            --replace 'TLS_LIBS +=' '#TLS_LIBS +=' \
+            --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto'
         '';
 
         enableParallelBuilding = true;
-        makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ];
+
+        makeFlags = [ "all" "fdb_java" ]
+          # Don't compile FDBLibTLS if we don't need it in 6.0 or later;
+          # it gets statically linked in
+          ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ]
+          # Needed environment overrides
+          ++ [ "KVRELEASE=1" ];
 
         # on 6.0 and later, we can specify all this information manually
         configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") ''
@@ -93,7 +105,9 @@ let
           mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
 
           cp -v ./lib/libfdb_c.so     $lib/lib
+        '' + lib.optionalString (!lib.versionAtLeast version "6.0") ''
           cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
+        '' + ''
 
           cp -v ./bindings/c/foundationdb/fdb_c.h           $dev/include/foundationdb
           cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
@@ -131,15 +145,16 @@ in with builtins; {
   };
 
   foundationdb52 = makeFdb rec {
-    version = "5.2.5";
+    version = "5.2.6";
     branch  = "release-5.2";
-    sha256  = "00csr4v9cwl9y8r63p73grc6cvhlqmzcniwrf80i0klxv5asg7q7";
+    rev     = "refs/tags/v5.2.6"; # seemed to be tagged incorrectly
+    sha256  = "1q3lq1hqq0f53n51gd4cw5cpayyw65dmkfplhsw1m5mghymzmskk";
   };
 
   foundationdb60 = makeFdb rec {
-    version = "6.0.0pre2227_${substring 0 8 rev}";
-    branch  = "master";
-    rev     = "8caa6eaecf1eeec0298fc77db334761b0c1d1523";
-    sha256  = "1q200rpsphl5fzwzp2vk7ifgsnqh95k0xfiicfi1c8253ylnsgll";
+    version = "6.0.2pre2430_${substring 0 8 rev}";
+    branch  = "release-6.0";
+    rev     = "7938d247a5eaf886a176575de6592b76374df58c";
+    sha256  = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h";
   };
 }
diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags-5.2.patch
similarity index 100%
rename from pkgs/servers/foundationdb/ldflags.patch
rename to pkgs/servers/foundationdb/ldflags-5.2.patch
diff --git a/pkgs/servers/foundationdb/ldflags-6.0.patch b/pkgs/servers/foundationdb/ldflags-6.0.patch
new file mode 100644
index 00000000000..1fa17a9615a
--- /dev/null
+++ b/pkgs/servers/foundationdb/ldflags-6.0.patch
@@ -0,0 +1,78 @@
+diff --git a/bindings/c/local.mk b/bindings/c/local.mk
+index c861a29c..ff886e93 100644
+--- a/bindings/c/local.mk
++++ b/bindings/c/local.mk
+@@ -30,8 +30,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
+ CLEAN_TARGETS += fdb_c_tests_clean
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
+-  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
++  fdb_c_LIBS += lib/libstdc++.a
++  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
+   fdb_c_tests_LIBS += -lpthread
+ endif
+ 
+diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
+index 2ef4fcb7..6e59625c 100644
+--- a/bindings/flow/tester/local.mk
++++ b/bindings/flow/tester/local.mk
+@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
+ 	@rm -rf bindings/flow/bin
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_flow_tester_LIBS += -ldl -lpthread -lrt
+-  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ else ifeq ($(PLATFORM),osx)
+   fdb_flow_tester_LDFLAGS += -lc++
+ endif
+diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
+index ca5dbab6..012f0130 100644
+--- a/fdbbackup/local.mk
++++ b/fdbbackup/local.mk
+@@ -26,8 +26,7 @@ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
+ fdbbackup_STATIC_LIBS := $(TLS_LIBS)
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbbackup_LIBS += -ldl -lpthread -lrt
+-  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
+diff --git a/fdbcli/local.mk b/fdbcli/local.mk
+index fd738876..3af026b9 100644
+--- a/fdbcli/local.mk
++++ b/fdbcli/local.mk
+@@ -22,14 +22,13 @@
+ 
+ fdbcli_CFLAGS := $(fdbclient_CFLAGS)
+ fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
+-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl $(FDB_TLS_LIB)
++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB)
+ fdbcli_STATIC_LIBS := $(TLS_LIBS)
+ 
+ fdbcli_GENERATED_SOURCES += versions.h
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
+-  fdbcli_LIBS += -lpthread -lrt
++  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
+ else ifeq ($(PLATFORM),osx)
+   fdbcli_LDFLAGS += -lc++
+ endif
+diff --git a/fdbserver/local.mk b/fdbserver/local.mk
+index 690916d0..475abbaf 100644
+--- a/fdbserver/local.mk
++++ b/fdbserver/local.mk
+@@ -26,8 +26,7 @@ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a $(FDB_TLS_LIB
+ fdbserver_STATIC_LIBS := $(TLS_LIBS)
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbserver_LIBS += -ldl -lpthread -lrt
+-  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
-- 
GitLab


From 52f53c69ce6dbc5538f7e4cd22f9d93baf1f64a2 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 21 Jul 2018 00:44:44 +0000
Subject: [PATCH 098/128] pkgs/*: remove unreferenced function arguments

---
 pkgs/applications/altcoins/clightning.nix     |  4 +-
 pkgs/applications/altcoins/default.nix        |  2 +-
 pkgs/applications/altcoins/dero.nix           |  2 +-
 pkgs/applications/altcoins/dogecoin.nix       |  2 +-
 .../applications/altcoins/ethsign/default.nix |  2 +-
 pkgs/applications/altcoins/freicoin.nix       |  2 +-
 .../altcoins/go-ethereum-classic/default.nix  |  2 +-
 pkgs/applications/altcoins/go-ethereum.nix    |  2 +-
 pkgs/applications/altcoins/hevm.nix           |  4 +-
 pkgs/applications/altcoins/mist.nix           |  2 +-
 pkgs/applications/altcoins/namecoin.nix       |  2 +-
 .../altcoins/nano-wallet/default.nix          |  2 +-
 .../altcoins/parity-ui/default.nix            |  2 +-
 pkgs/applications/altcoins/parity-ui/env.nix  |  2 +-
 .../altcoins/particl/particl-core.nix         |  3 -
 pkgs/applications/altcoins/stellar-core.nix   |  2 +-
 pkgs/applications/audio/abcde/default.nix     |  4 +-
 pkgs/applications/audio/airwave/default.nix   |  2 +-
 pkgs/applications/audio/audacity/default.nix  |  4 +-
 pkgs/applications/audio/banshee/default.nix   |  2 +-
 .../applications/audio/clementine/default.nix |  2 +-
 pkgs/applications/audio/deadbeef/default.nix  |  2 +-
 pkgs/applications/audio/deadbeef/wrapper.nix  |  2 +-
 pkgs/applications/audio/distrho/default.nix   |  2 +-
 pkgs/applications/audio/faust/faust2.nix      |  1 -
 pkgs/applications/audio/fmit/default.nix      |  2 +-
 pkgs/applications/audio/gradio/default.nix    |  1 -
 pkgs/applications/audio/gtkpod/default.nix    |  4 +-
 pkgs/applications/audio/jaaa/default.nix      |  2 +-
 .../audio/lastfmsubmitd/default.nix           |  2 +-
 .../magnetophonDSP/VoiceOfFaust/default.nix   |  2 +-
 pkgs/applications/audio/mikmod/default.nix    |  2 +-
 pkgs/applications/audio/mopidy/mopify.nix     |  2 +-
 pkgs/applications/audio/pianobar/default.nix  |  2 +-
 pkgs/applications/audio/picard/default.nix    |  2 +-
 pkgs/applications/audio/puddletag/default.nix |  2 +-
 pkgs/applications/audio/puredata/wrapper.nix  |  2 +-
 pkgs/applications/audio/rkrlv2/default.nix    |  2 +-
 pkgs/applications/audio/sonata/default.nix    |  2 +-
 pkgs/applications/audio/ympd/default.nix      |  2 +-
 .../applications/backup/crashplan/default.nix |  2 +-
 .../display-managers/lightdm/default.nix      |  2 +-
 .../display-managers/sddm/default.nix         |  4 +-
 .../editors/android-studio/default.nix        |  2 +-
 pkgs/applications/editors/atom/default.nix    |  2 +-
 pkgs/applications/editors/atom/env.nix        |  2 +-
 .../applications/editors/brackets/default.nix |  4 +-
 pkgs/applications/editors/dit/default.nix     |  2 +-
 pkgs/applications/editors/eclipse/default.nix |  6 +-
 .../emacs-clang-complete-async/default.nix    |  2 +-
 .../emacs-modes/filesets-plus/default.nix     |  2 +-
 .../emacs-modes/font-lock-plus/default.nix    |  2 +-
 .../editors/emacs-modes/header2/default.nix   |  2 +-
 .../editors/emacs-modes/hexrgb/default.nix    |  2 +-
 .../emacs-modes/lib-requires/default.nix      |  2 +-
 .../emacs-modes/melpa-stable-packages.nix     |  2 +-
 .../editors/emacs-modes/ocaml/default.nix     |  2 +-
 .../editors/emacs-modes/org-packages.nix      |  2 +-
 .../editors/emacs-modes/org/default.nix       |  2 +-
 .../emacs-modes/thingatpt-plus/default.nix    |  2 +-
 pkgs/applications/editors/emacs/25.nix        |  2 +-
 pkgs/applications/editors/emacs/default.nix   |  2 +-
 .../applications/editors/jetbrains/common.nix |  4 +-
 .../editors/jetbrains/default.nix             | 24 ++++----
 pkgs/applications/editors/jucipp/default.nix  |  2 +-
 pkgs/applications/editors/kakoune/default.nix |  2 +-
 .../editors/kodestudio/default.nix            |  2 +-
 .../editors/monodevelop/default.nix           |  2 +-
 pkgs/applications/editors/nano/default.nix    |  2 +-
 pkgs/applications/editors/neovim/default.nix  |  4 +-
 pkgs/applications/editors/neovim/wrapper.nix  |  5 +-
 pkgs/applications/editors/nvpy/default.nix    |  2 +-
 pkgs/applications/editors/texmacs/darwin.nix  |  2 +-
 pkgs/applications/editors/tiled/default.nix   |  2 +-
 pkgs/applications/editors/typora/default.nix  |  2 +-
 pkgs/applications/editors/vim/macvim.nix      |  2 +-
 pkgs/applications/editors/vscode/default.nix  |  2 +-
 .../editors/vscode/with-extensions.nix        |  2 +-
 .../editors/wxhexeditor/default.nix           |  2 +-
 pkgs/applications/gis/qgis/default.nix        |  2 +-
 .../applications/graphics/ImageMagick/7.0.nix |  4 +-
 .../graphics/ImageMagick/default.nix          |  2 +-
 .../graphics/ahoviewer/default.nix            |  2 +-
 .../applications/graphics/avocode/default.nix |  2 +-
 .../graphics/awesomebump/default.nix          |  2 +-
 .../applications/graphics/digikam/default.nix |  3 +-
 pkgs/applications/graphics/dosage/default.nix |  2 +-
 pkgs/applications/graphics/epeg/default.nix   |  2 +-
 pkgs/applications/graphics/fstl/default.nix   |  2 +-
 .../applications/graphics/glabels/default.nix |  2 +-
 pkgs/applications/graphics/goxel/default.nix  |  2 +-
 .../graphics/graphicsmagick/default.nix       |  2 +-
 .../graphics/inkscape/default.nix             |  2 +-
 pkgs/applications/graphics/k3d/default.nix    |  2 +-
 .../graphics/kgraphviewer/default.nix         |  2 +-
 pkgs/applications/graphics/krita/default.nix  |  2 +-
 pkgs/applications/graphics/nomacs/default.nix |  1 -
 .../graphics/openscad/default.nix             |  2 +-
 .../graphics/processing3/default.nix          |  2 +-
 .../graphics/sane/backends/generic.nix        |  2 +-
 .../graphics/scantailor/advanced.nix          |  2 +-
 .../graphics/screencloud/default.nix          |  2 +-
 .../applications/graphics/shutter/default.nix |  2 +-
 .../graphics/synfigstudio/default.nix         |  4 +-
 .../graphics/write_stylus/default.nix         |  2 +-
 pkgs/applications/graphics/yed/default.nix    |  2 +-
 pkgs/applications/inferno/default.nix         |  2 +-
 pkgs/applications/kde/ark/default.nix         |  2 +-
 pkgs/applications/kde/default.nix             |  3 +-
 pkgs/applications/kde/dolphin.nix             |  4 +-
 pkgs/applications/kde/kdenlive.nix            |  5 --
 pkgs/applications/kde/libkomparediff2.nix     |  2 +-
 pkgs/applications/kde/pim-data-exporter.nix   |  2 +-
 pkgs/applications/kde/pimcommon.nix           |  2 +-
 pkgs/applications/misc/acbuild/default.nix    |  2 +-
 pkgs/applications/misc/alacritty/default.nix  |  1 -
 .../misc/bashSnippets/default.nix             |  2 +-
 pkgs/applications/misc/calibre/default.nix    |  4 +-
 pkgs/applications/misc/cataract/default.nix   | 11 +---
 pkgs/applications/misc/cataract/unstable.nix  | 11 +---
 pkgs/applications/misc/cherrytree/default.nix |  2 +-
 pkgs/applications/misc/chirp/default.nix      |  2 +-
 .../misc/dbvisualizer/default.nix             |  2 +-
 .../misc/dfilemanager/default.nix             |  2 +-
 .../misc/electron-cash/default.nix            |  2 +-
 pkgs/applications/misc/electrum/default.nix   |  2 +-
 pkgs/applications/misc/evtest/default.nix     |  2 +-
 pkgs/applications/misc/far2l/default.nix      |  2 +-
 pkgs/applications/misc/finalterm/default.nix  |  2 +-
 pkgs/applications/misc/gcal/default.nix       |  2 +-
 .../misc/golden-cheetah/default.nix           |  2 +-
 .../applications/misc/googleearth/default.nix |  2 +-
 pkgs/applications/misc/gpsprune/default.nix   |  2 +-
 pkgs/applications/misc/gpxsee/default.nix     |  2 +-
 pkgs/applications/misc/gramps/default.nix     |  2 +-
 pkgs/applications/misc/gummi/default.nix      |  2 +-
 .../misc/hamster-time-tracker/default.nix     |  2 +-
 pkgs/applications/misc/haxor-news/default.nix |  2 +-
 pkgs/applications/misc/houdini/default.nix    |  2 +-
 pkgs/applications/misc/icesl/default.nix      |  2 +-
 pkgs/applications/misc/josm/default.nix       |  2 +-
 pkgs/applications/misc/khard/default.nix      |  2 +-
 pkgs/applications/misc/kitty/default.nix      |  4 +-
 pkgs/applications/misc/kiwix/default.nix      |  2 +-
 pkgs/applications/misc/kupfer/default.nix     |  2 -
 pkgs/applications/misc/llpp/default.nix       |  2 +-
 pkgs/applications/misc/madonctl/default.nix   |  2 +-
 .../misc/masterpdfeditor/default.nix          |  2 +-
 pkgs/applications/misc/mop/default.nix        |  2 +-
 pkgs/applications/misc/octoprint/default.nix  |  2 +-
 pkgs/applications/misc/octoprint/plugins.nix  |  2 +-
 pkgs/applications/misc/orca/default.nix       |  4 +-
 pkgs/applications/misc/perkeep/default.nix    |  2 +-
 pkgs/applications/misc/pgmanage/default.nix   |  2 +-
 pkgs/applications/misc/polybar/default.nix    |  2 +-
 pkgs/applications/misc/pt/default.nix         |  2 +-
 .../misc/redis-desktop-manager/default.nix    |  2 +-
 pkgs/applications/misc/redshift/default.nix   |  2 +-
 pkgs/applications/misc/rofi/default.nix       |  2 +-
 pkgs/applications/misc/rofi/wrapper.nix       |  2 +-
 pkgs/applications/misc/roxterm/default.nix    |  6 +-
 pkgs/applications/misc/rtv/default.nix        |  2 +-
 .../misc/rxvt_unicode/wrapper.nix             |  2 +-
 pkgs/applications/misc/simplenote/default.nix |  2 +-
 pkgs/applications/misc/slic3r/prusa3d.nix     |  2 +-
 pkgs/applications/misc/spacefm/default.nix    |  2 +-
 .../applications/misc/sweethome3d/editors.nix |  4 +-
 pkgs/applications/misc/tasksh/default.nix     |  2 +-
 pkgs/applications/misc/tilix/default.nix      |  2 +-
 .../applications/misc/timewarrior/default.nix |  2 +-
 pkgs/applications/misc/twmn/default.nix       |  2 +-
 pkgs/applications/misc/wego/default.nix       |  2 +-
 pkgs/applications/misc/welle-io/default.nix   |  2 +-
 pkgs/applications/misc/wsjtx/default.nix      |  2 +-
 pkgs/applications/misc/xmr-stak/default.nix   |  2 +-
 pkgs/applications/misc/yarssr/default.nix     |  2 +-
 .../misc/yubioath-desktop/default.nix         |  2 +-
 .../misc/zathura/core/default.nix             |  2 +-
 .../misc/zathura/pdf-mupdf/default.nix        |  3 +-
 pkgs/applications/misc/zscroll/default.nix    |  2 +-
 .../networking/browsers/chromium/common.nix   |  5 +-
 .../networking/browsers/falkon/default.nix    |  4 +-
 .../networking/browsers/firefox/common.nix    |  2 +-
 .../networking/browsers/firefox/packages.nix  |  2 +-
 .../browsers/google-chrome/default.nix        |  2 +-
 .../networking/browsers/lynx/default.nix      |  1 -
 .../google-talk-plugin/default.nix            |  2 +-
 .../mozilla-plugins/trezor/default.nix        |  2 +-
 .../networking/browsers/otter/default.nix     |  2 +-
 .../browsers/vimprobable2/default.nix         |  2 +-
 .../networking/browsers/vivaldi/default.nix   |  4 +-
 .../browsers/vivaldi/ffmpeg-codecs.nix        |  2 +-
 .../networking/cluster/habitat/default.nix    |  2 +-
 .../networking/cluster/kompose/default.nix    |  2 +-
 .../networking/cluster/kops/default.nix       |  2 +-
 .../networking/cluster/kubernetes/default.nix |  3 +-
 .../networking/cluster/mesos/default.nix      |  2 +-
 .../networking/cluster/minikube/default.nix   |  4 +-
 .../networking/cluster/openshift/default.nix  |  4 +-
 .../networking/cluster/taktuk/default.nix     |  2 +-
 .../terraform-provider-ibm/default.nix        |  2 +-
 .../terraform-provider-nixos/default.nix      |  2 +-
 .../networking/cluster/terraform/default.nix  |  4 +-
 .../cluster/terraform/providers/default.nix   |  2 +-
 .../networking/compactor/default.nix          |  2 +-
 .../applications/networking/drive/default.nix |  2 +-
 .../bitlbee-facebook/default.nix              |  2 +-
 .../bitlbee-steam/default.nix                 |  2 +-
 .../instant-messengers/bitlbee/default.nix    |  2 +-
 .../instant-messengers/ekiga/default.nix      |  2 +-
 .../instant-messengers/linphone/default.nix   |  2 +-
 .../instant-messengers/mikutter/default.nix   |  2 +-
 .../instant-messengers/pidgin/wrapper.nix     |  2 +-
 .../instant-messengers/pond/default.nix       |  4 +-
 .../instant-messengers/psi/default.nix        |  2 +-
 .../instant-messengers/ricochet/default.nix   |  2 +-
 .../ring-daemon/default.nix                   |  1 -
 .../instant-messengers/riot/riot-web.nix      |  2 +-
 .../instant-messengers/slack/default.nix      |  2 +-
 .../telegram/tdesktop/default.nix             |  2 +-
 .../instant-messengers/utox/default.nix       |  2 +-
 .../instant-messengers/vacuum/default.nix     |  2 +-
 .../networking/irc/irssi/otr/default.nix      |  2 +-
 .../networking/irc/weechat/default.nix        |  4 +-
 .../networking/mailreaders/alpine/default.nix |  2 +-
 .../mailreaders/mailnag/default.nix           |  2 +-
 .../mailreaders/mailpile/default.nix          |  2 +-
 .../mailreaders/msgviewer/default.nix         |  2 +-
 .../mailreaders/nylas-mail-bin/default.nix    |  3 +-
 .../mailreaders/realpine/default.nix          |  2 +-
 .../networking/mailreaders/sup/default.nix    |  3 +-
 .../mailreaders/thunderbird/default.nix       |  2 +-
 .../networking/newsreaders/pan/default.nix    |  2 +-
 .../applications/networking/owamp/default.nix |  2 +-
 .../networking/p2p/frostwire/default.nix      |  2 +-
 .../networking/p2p/ktorrent/default.nix       |  2 +-
 .../networking/p2p/retroshare/default.nix     |  2 +-
 .../networking/p2p/soulseekqt/default.nix     |  4 +-
 .../networking/p2p/transmission/default.nix   |  2 +-
 .../networking/p2p/tribler/default.nix        |  2 +-
 .../networking/pyload/default.nix             |  3 +-
 .../networking/remote/anydesk/default.nix     |  4 +-
 .../networking/remote/freerdp/legacy.nix      |  3 +-
 .../networking/remote/ssvnc/default.nix       |  2 +-
 .../networking/remote/teamviewer/default.nix  |  2 +-
 .../networking/remote/xrdp/default.nix        |  2 +-
 .../networking/seafile-client/default.nix     |  2 +-
 .../networking/sniffers/wireshark/default.nix |  4 +-
 .../networking/super-productivity/default.nix |  2 +-
 .../networking/sync/backintime/qt4.nix        |  2 +-
 .../networking/sync/casync/default.nix        |  2 +-
 .../networking/sync/rsync/base.nix            |  2 +-
 .../networking/sync/rsync/default.nix         |  4 +-
 .../networking/sync/rsync/rrsync.nix          |  2 +-
 pkgs/applications/networking/znc/modules.nix  |  2 +-
 pkgs/applications/office/autokey/default.nix  |  2 +-
 pkgs/applications/office/calligra/default.nix |  2 +-
 .../office/impressive/default.nix             |  2 +-
 .../office/libreoffice/default.nix            |  4 +-
 .../applications/office/libreoffice/still.nix |  4 +-
 .../applications/office/moneyplex/default.nix |  2 +-
 pkgs/applications/office/timetrap/default.nix |  2 +-
 pkgs/applications/office/trytond/default.nix  |  2 +-
 .../applications/office/wpsoffice/default.nix |  2 +-
 pkgs/applications/office/zim/default.nix      |  2 +-
 .../science/astronomy/celestia/default.nix    |  3 +-
 .../science/astronomy/stellarium/default.nix  |  2 +-
 .../science/biology/diamond/default.nix       |  2 +-
 .../science/biology/freebayes/default.nix     |  2 +-
 .../science/biology/mosdepth/default.nix      |  2 +-
 .../science/biology/raxml/default.nix         |  1 -
 .../science/biology/vcftools/default.nix      |  2 +-
 .../science/electronics/adms/default.nix      |  2 +-
 .../science/electronics/bitscope/common.nix   |  2 -
 .../science/electronics/bitscope/packages.nix |  5 +-
 .../science/electronics/kicad/default.nix     |  2 +-
 .../science/electronics/librepcb/default.nix  |  2 +-
 .../science/logic/aspino/default.nix          |  2 +-
 .../science/logic/coq2html/default.nix        |  2 +-
 .../science/logic/elan/default.nix            |  2 +-
 .../science/logic/hol_light/default.nix       |  2 +-
 .../science/logic/lean2/default.nix           |  2 +-
 .../science/logic/mcrl2/default.nix           |  3 +-
 .../science/logic/saw-tools/default.nix       |  2 +-
 .../science/logic/tamarin-prover/default.nix  |  2 +-
 .../science/logic/tlaplus/tlaps.nix           |  6 +-
 .../science/logic/workcraft/default.nix       |  2 +-
 .../machine-learning/torch/torch-distro.nix   |  6 +-
 pkgs/applications/science/math/R/default.nix  |  2 +-
 .../science/math/cntk/default.nix             |  2 +-
 .../science/math/colpack/default.nix          |  2 +-
 .../science/math/mathematica/10.nix           |  2 -
 .../science/math/mathematica/9.nix            |  2 -
 .../science/math/mathematica/default.nix      |  1 -
 .../science/math/sage/env-locations.nix       |  3 +-
 .../science/math/sage/openblas-pc.nix         |  3 +-
 .../science/math/sage/sage-with-env.nix       |  3 -
 .../science/math/sage/sagedoc.nix             |  4 +-
 .../science/math/sage/sagelib.nix             |  3 +-
 .../science/math/scilab/default.nix           |  2 +-
 .../science/math/singular/default.nix         |  2 +-
 .../science/misc/gephi/default.nix            |  2 +-
 pkgs/applications/science/misc/golly/beta.nix |  2 +-
 .../science/misc/openmvg/default.nix          |  2 +-
 .../science/misc/openmvs/default.nix          |  2 +-
 .../science/misc/root/default.nix             |  2 +-
 .../science/robotics/gazebo/default.nix       |  2 +-
 .../robotics/qgroundcontrol/default.nix       |  6 +-
 .../science/robotics/yarp/default.nix         |  2 +-
 pkgs/applications/science/spyder/default.nix  |  4 +-
 .../version-management/bazaar/tools.nix       |  2 +-
 .../version-management/bitkeeper/default.nix  |  4 +-
 .../git-and-tools/fast-export/default.nix     |  2 +-
 .../git-annex-remote-b2/default.nix           |  2 +-
 .../git-and-tools/git-cola/default.nix        |  2 +-
 .../git-and-tools/git-dit/default.nix         |  1 -
 .../git-and-tools/git-fame/default.nix        |  2 +-
 .../git-and-tools/git-hub/default.nix         |  2 +-
 .../git-and-tools/hub/default.nix             |  2 +-
 .../svn-all-fast-export/default.nix           |  2 +-
 .../version-management/git-lfs/1.nix          |  2 +-
 .../version-management/git-review/default.nix |  2 +-
 .../version-management/git-sizer/default.nix  |  2 +-
 .../version-management/gitea/default.nix      |  2 +-
 .../version-management/gitkraken/default.nix  |  2 +-
 .../version-management/gitlab/default.nix     |  2 +-
 .../version-management/gogs/default.nix       |  2 +-
 .../version-management/guitone/default.nix    |  2 +-
 .../version-management/mercurial/default.nix  |  4 +-
 .../version-management/rapidsvn/default.nix   |  2 +-
 .../version-management/redmine/default.nix    |  2 +-
 .../reposurgeon/default.nix                   |  2 +-
 .../version-management/smartgithg/default.nix |  1 -
 .../version-management/tailor/default.nix     |  2 +-
 .../version-management/yadm/default.nix       |  2 +-
 pkgs/applications/video/avidemux/default.nix  |  2 +-
 pkgs/applications/video/cinelerra/default.nix |  2 +-
 pkgs/applications/video/devede/default.nix    |  2 +-
 pkgs/applications/video/handbrake/default.nix |  4 +-
 pkgs/applications/video/k9copy/default.nix    |  2 +-
 pkgs/applications/video/kodi/commons.nix      |  5 +-
 pkgs/applications/video/kodi/default.nix      |  2 +-
 pkgs/applications/video/kodi/plugins.nix      |  2 +-
 .../applications/video/lightworks/default.nix |  4 +-
 pkgs/applications/video/mapmap/default.nix    |  1 -
 pkgs/applications/video/mplayer/default.nix   |  2 +-
 pkgs/applications/video/mpv/default.nix       |  2 +-
 pkgs/applications/video/natron/default.nix    |  2 +-
 .../video/openshot-qt/libopenshot.nix         |  2 +-
 pkgs/applications/video/pitivi/default.nix    |  2 +-
 .../video/qstopmotion/default.nix             |  2 +-
 .../video/recordmydesktop/gtk.nix             |  2 +-
 .../video/zdfmediathk/default.nix             |  2 +-
 .../virtualization/containerd/default.nix     |  2 +-
 .../virtualization/docker/default.nix         |  2 +-
 .../virtualization/runc/default.nix           |  2 +-
 .../virtualization/virtinst/default.nix       |  2 +-
 .../virtualization/virtualbox/default.nix     |  6 +-
 .../virtualization/vpcs/default.nix           |  2 +-
 .../window-managers/bspwm/default.nix         |  2 +-
 .../window-managers/bspwm/unstable.nix        |  2 +-
 .../window-managers/clfswm/default.nix        |  5 +-
 .../window-managers/i3/default.nix            |  2 +-
 .../window-managers/notion/default.nix        |  2 +-
 .../window-managers/spectrwm/default.nix      |  1 -
 .../window-managers/stumpwm/default.nix       |  2 +-
 .../window-managers/taffybar/default.nix      |  2 +-
 .../window-managers/wtftw/default.nix         |  2 +-
 .../build-fhs-userenv/default.nix             |  2 +-
 pkgs/build-support/docker/default.nix         |  1 -
 pkgs/build-support/emacs/elpa.nix             |  2 +-
 pkgs/build-support/emacs/melpa.nix            |  2 +-
 pkgs/build-support/fetchdarcs/default.nix     |  2 +-
 .../build-support/fetchdocker/credentials.nix |  2 +-
 pkgs/build-support/fetchdocker/default.nix    |  2 +-
 pkgs/build-support/fetchgit/private.nix       |  2 +-
 pkgs/build-support/fetchgitlocal/default.nix  |  2 +-
 pkgs/build-support/fetchhg/default.nix        |  2 +-
 pkgs/build-support/fetchnuget/default.nix     |  2 +-
 pkgs/build-support/fetchs3/default.nix        |  1 -
 pkgs/build-support/rust/build-rust-crate.nix  | 16 +++---
 .../rust/cargo-vendor/cargo-vendor.nix        |  2 +-
 pkgs/build-support/rust/default.nix           |  2 +-
 .../singularity-tools/default.nix             |  3 +-
 pkgs/data/fonts/arkpandora/default.nix        |  2 +-
 pkgs/data/fonts/iosevka/default.nix           |  1 -
 pkgs/data/fonts/noto-fonts/default.nix        |  2 +-
 pkgs/data/fonts/tex-gyre/default.nix          |  2 +-
 pkgs/data/misc/cacert/default.nix             |  2 +-
 .../schemas/xml-dtd/docbook-ebnf/default.nix  |  2 +-
 .../schemas/xml-dtd/docbook/4.1.2.nix         |  2 +-
 .../sgml+xml/schemas/xml-dtd/docbook/4.2.nix  |  2 +-
 .../sgml+xml/schemas/xml-dtd/docbook/4.3.nix  |  2 +-
 .../sgml+xml/schemas/xml-dtd/docbook/4.4.nix  |  2 +-
 .../sgml+xml/schemas/xml-dtd/docbook/4.5.nix  |  2 +-
 .../schemas/xml-dtd/docbook/generic.nix       |  2 +-
 pkgs/desktops/enlightenment/enlightenment.nix |  2 +-
 .../desktop/gnome-control-center/default.nix  |  5 +-
 .../gnome-2/desktop/gnome-panel/default.nix   |  6 +-
 .../desktop/mail-notification/default.nix     |  2 +-
 .../gnome-2/desktop/zenity/default.nix        |  2 +-
 .../platform/gnome-vfs-monikers/default.nix   |  2 +-
 .../gnome-2/platform/libbonobo/default.nix    |  2 +-
 .../gnome-2/platform/libgnome/default.nix     |  2 +-
 .../gnome-3/apps/gnome-characters/default.nix |  2 +-
 .../gnome-3/apps/gnome-documents/default.nix  |  8 +--
 .../gnome-3/apps/gnome-music/default.nix      |  2 +-
 pkgs/desktops/gnome-3/apps/polari/default.nix |  2 +-
 .../gnome-3/apps/seahorse/default.nix         |  2 +-
 pkgs/desktops/gnome-3/core/dconf/default.nix  |  2 +-
 .../desktops/gnome-3/core/empathy/default.nix |  4 +-
 pkgs/desktops/gnome-3/core/gdm/default.nix    |  2 +-
 .../gnome-3/core/gnome-shell/default.nix      |  2 +-
 .../gnome-3/core/gnome-user-docs/default.nix  |  2 +-
 .../gnome-3/core/gnome-user-share/default.nix |  4 +-
 .../gnome-3/core/grilo-plugins/default.nix    |  2 +-
 .../gsettings-desktop-schemas/default.nix     |  2 +-
 .../gnome-3/core/gucharmap/default.nix        |  2 +-
 .../gnome-3/core/nautilus/default.nix         |  2 +-
 pkgs/desktops/gnome-3/core/sushi/default.nix  |  2 +-
 pkgs/desktops/gnome-3/core/totem/default.nix  |  4 +-
 pkgs/desktops/gnome-3/core/vte/default.nix    |  2 +-
 .../gnome-3/core/yelp-xsl/default.nix         |  2 +-
 pkgs/desktops/gnome-3/core/zenity/default.nix |  2 +-
 .../extensions/system-monitor/default.nix     |  2 +-
 .../extensions/topicons-plus/default.nix      |  2 +-
 .../gnome-3/misc/gfbgraph/default.nix         |  2 +-
 pkgs/desktops/gnome-3/misc/gitg/default.nix   |  4 +-
 .../gnome-3/misc/gnome-tweaks/default.nix     |  6 +-
 pkgs/desktops/gnome-3/misc/libgda/default.nix |  2 +-
 pkgs/desktops/gnustep/gworkspace/default.nix  |  1 -
 .../gnustep/make/gsmakeDerivation.nix         |  2 +-
 .../lxqt/core/lxqt-config/default.nix         |  2 +-
 pkgs/desktops/lxqt/default.nix                |  2 +-
 pkgs/desktops/mate/mate-applets/default.nix   |  2 +-
 .../mate/mate-settings-daemon/default.nix     |  2 +-
 pkgs/desktops/mate/mate-themes/default.nix    |  2 +-
 pkgs/desktops/plasma-5/default.nix            |  3 +-
 pkgs/desktops/plasma-5/kdeplasma-addons.nix   |  2 +-
 pkgs/desktops/plasma-5/kwin/default.nix       |  2 +-
 .../xfce/applications/xfce4-screenshooter.nix |  2 +-
 pkgs/desktops/xfce/core/xfce4-session.nix     |  2 +-
 .../appmenu-gtk-module.nix                    |  2 +-
 .../arduino/platformio/default.nix            |  2 +-
 pkgs/development/compilers/boo/default.nix    |  5 +-
 .../compilers/chicken/eggDerivation.nix       |  2 +-
 pkgs/development/compilers/clasp/default.nix  |  2 +-
 .../compilers/cudatoolkit/default.nix         |  2 +-
 .../compilers/dotnet/sdk/default.nix          |  1 -
 pkgs/development/compilers/elm/default.nix    |  2 +-
 .../compilers/emscripten/default.nix          |  4 +-
 .../fastcomp/emscripten-fastcomp.nix          |  2 +-
 .../compilers/factor-lang/default.nix         |  2 +-
 pkgs/development/compilers/gambit/build.nix   |  2 +-
 pkgs/development/compilers/gambit/default.nix |  1 -
 .../development/compilers/gambit/unstable.nix |  1 -
 .../development/compilers/gcc/4.8/default.nix |  1 -
 .../development/compilers/gcc/4.9/default.nix |  1 -
 pkgs/development/compilers/gcc/5/default.nix  |  1 -
 pkgs/development/compilers/gcc/6/default.nix  |  1 -
 pkgs/development/compilers/gcc/7/default.nix  |  1 -
 pkgs/development/compilers/gcc/8/default.nix  |  3 +-
 .../compilers/gcc/snapshot/default.nix        |  1 -
 pkgs/development/compilers/gcl/2.6.13-pre.nix |  2 +-
 pkgs/development/compilers/gcl/default.nix    |  2 +-
 pkgs/development/compilers/gerbil/build.nix   |  2 +-
 pkgs/development/compilers/ghc/7.10.3.nix     |  4 +-
 pkgs/development/compilers/ghc/8.0.2.nix      |  2 +-
 pkgs/development/compilers/ghc/8.2.2.nix      |  2 +-
 pkgs/development/compilers/ghc/8.4.3.nix      |  2 +-
 pkgs/development/compilers/ghc/8.6.1.nix      |  4 +-
 pkgs/development/compilers/ghc/head.nix       |  2 +-
 .../ghcjs-ng/configured-ghcjs-src.nix         |  1 -
 pkgs/development/compilers/ghcjs/base.nix     |  7 +--
 pkgs/development/compilers/go/1.10.nix        |  2 +-
 pkgs/development/compilers/go/1.9.nix         |  2 +-
 .../development/compilers/graalvm/default.nix |  2 +-
 pkgs/development/compilers/haxe/default.nix   |  2 +-
 .../development/compilers/inform7/default.nix |  2 +-
 .../compilers/ios-cross-compile/9.2.nix       |  2 +-
 pkgs/development/compilers/ispc/default.nix   |  2 +-
 pkgs/development/compilers/julia/0.5.nix      |  5 +-
 pkgs/development/compilers/julia/0.6.nix      |  5 +-
 pkgs/development/compilers/julia/default.nix  |  2 +-
 pkgs/development/compilers/ldc/default.nix    |  2 +-
 pkgs/development/compilers/llvm/3.4/llvm.nix  |  1 -
 .../compilers/llvm/3.5/dragonegg.nix          |  2 +-
 .../compilers/llvm/3.7/default.nix            |  4 +-
 pkgs/development/compilers/llvm/3.7/llvm.nix  |  1 -
 .../compilers/llvm/3.8/default.nix            |  2 +-
 pkgs/development/compilers/llvm/3.8/llvm.nix  |  1 -
 .../compilers/llvm/3.9/default.nix            |  2 +-
 pkgs/development/compilers/llvm/3.9/llvm.nix  |  2 -
 pkgs/development/compilers/llvm/4/default.nix |  3 +-
 .../compilers/llvm/4/libc++/default.nix       |  2 +-
 pkgs/development/compilers/llvm/4/lld.nix     |  2 -
 pkgs/development/compilers/llvm/4/llvm.nix    |  2 -
 pkgs/development/compilers/llvm/4/openmp.nix  |  1 -
 .../compilers/llvm/5/clang/default.nix        |  2 +-
 pkgs/development/compilers/llvm/5/default.nix |  3 +-
 .../compilers/llvm/5/libc++/default.nix       |  2 +-
 pkgs/development/compilers/llvm/5/lld.nix     |  2 -
 pkgs/development/compilers/llvm/5/llvm.nix    |  3 -
 pkgs/development/compilers/llvm/5/openmp.nix  |  1 -
 .../compilers/llvm/6/clang/default.nix        |  2 +-
 pkgs/development/compilers/llvm/6/default.nix |  3 +-
 .../compilers/llvm/6/libc++/default.nix       |  2 +-
 pkgs/development/compilers/llvm/6/lld.nix     |  1 -
 pkgs/development/compilers/llvm/6/llvm.nix    |  3 -
 pkgs/development/compilers/llvm/6/openmp.nix  |  1 -
 .../compilers/matter-compiler/default.nix     |  2 +-
 pkgs/development/compilers/mcpp/default.nix   |  2 +-
 pkgs/development/compilers/mono/4.0.nix       |  2 +-
 pkgs/development/compilers/mono/4.4.nix       |  2 +-
 pkgs/development/compilers/mono/4.6.nix       |  2 +-
 pkgs/development/compilers/mono/4.8.nix       |  2 +-
 pkgs/development/compilers/mono/5.0.nix       |  2 +-
 pkgs/development/compilers/mono/5.4.nix       |  2 +-
 pkgs/development/compilers/mono/5.8.nix       |  2 +-
 .../compilers/nvidia-cg-toolkit/default.nix   |  2 +-
 .../development/compilers/obliv-c/default.nix |  2 +-
 pkgs/development/compilers/openjdk/10.nix     |  2 +-
 .../compilers/openjdk/bootstrap.nix           |  2 +-
 .../compilers/oraclejdk/jdk10-linux.nix       |  2 -
 pkgs/development/compilers/pakcs/default.nix  |  4 +-
 .../compilers/rust/binaryBuild.nix            |  2 +-
 pkgs/development/compilers/rust/cargo.nix     |  2 +-
 .../development/compilers/souffle/default.nix |  2 +-
 pkgs/development/compilers/swift/default.nix  |  1 -
 pkgs/development/compilers/urweb/default.nix  |  2 +-
 .../coq-modules/mathcomp/generic.nix          |  2 +-
 .../coq-modules/ssreflect/generic.nix         |  2 +-
 .../idris-modules/build-builtin-package.nix   |  2 +-
 pkgs/development/interpreters/erlang/R19.nix  |  2 +-
 pkgs/development/interpreters/erlang/R20.nix  |  2 +-
 pkgs/development/interpreters/erlang/R21.nix  |  2 +-
 .../interpreters/erlang/generic-builder.nix   |  2 +-
 pkgs/development/interpreters/guile/2.0.nix   |  2 +-
 .../interpreters/guile/default.nix            |  2 +-
 pkgs/development/interpreters/lua-5/5.1.nix   |  2 +-
 pkgs/development/interpreters/lua-5/5.2.nix   |  4 +-
 pkgs/development/interpreters/lua-5/5.3.nix   |  4 +-
 .../interpreters/luajit/default.nix           |  2 +-
 .../development/interpreters/perl/default.nix |  2 +-
 pkgs/development/interpreters/php/default.nix |  2 +-
 pkgs/development/interpreters/pyrex/0.9.5.nix |  2 +-
 pkgs/development/interpreters/pyrex/0.9.6.nix |  2 +-
 .../python/cpython/2.7/default.nix            |  3 +-
 .../python/cpython/3.4/default.nix            |  2 +-
 .../python/cpython/3.5/default.nix            |  2 +-
 .../python/cpython/3.6/default.nix            |  3 +-
 .../python/cpython/3.7/default.nix            |  3 +-
 .../interpreters/python/pypy/2.7/default.nix  |  2 +-
 .../interpreters/rebol/default.nix            |  2 +-
 .../development/interpreters/self/default.nix |  2 +-
 pkgs/development/interpreters/tcl/generic.nix |  2 +-
 .../interpreters/unicon-lang/default.nix      |  2 +-
 .../development/java-modules/jogl/default.nix |  2 +-
 .../java-modules/maven-minimal.nix            |  2 +-
 .../development/java-modules/mavenPlugins.nix |  2 +-
 .../libraries/arguments/default.nix           |  2 +-
 pkgs/development/libraries/assimp/default.nix |  2 +-
 .../libraries/audio/libbass/default.nix       |  2 +-
 pkgs/development/libraries/avro-c/default.nix |  2 +-
 .../development/libraries/belcard/default.nix |  2 +-
 .../libraries/belle-sip/default.nix           |  2 +-
 pkgs/development/libraries/belr/default.nix   |  2 +-
 pkgs/development/libraries/bzrtp/default.nix  |  2 +-
 pkgs/development/libraries/caf/default.nix    |  2 +-
 pkgs/development/libraries/cairo/default.nix  |  2 +-
 .../development/libraries/cairomm/default.nix |  2 +-
 .../libraries/capstone/default.nix            |  2 +-
 pkgs/development/libraries/cl/default.nix     |  2 +-
 .../development/libraries/clutter/default.nix |  2 +-
 .../libraries/crypto++/default.nix            |  2 +-
 pkgs/development/libraries/db/generic.nix     |  2 +-
 .../libraries/dbus-sharp/dbus-sharp-1.0.nix   |  2 +-
 .../libraries/dbus-sharp/default.nix          |  2 +-
 pkgs/development/libraries/eclib/default.nix  |  2 -
 pkgs/development/libraries/expat/default.nix  |  2 +-
 pkgs/development/libraries/faac/default.nix   |  2 +-
 .../libraries/ffmpeg-full/default.nix         |  3 +-
 .../libraries/ffmpeg-sixel/default.nix        |  2 +-
 .../libraries/ffmpegthumbnailer/default.nix   |  2 +-
 pkgs/development/libraries/folly/default.nix  |  2 +-
 .../libraries/fontconfig/default.nix          |  2 +-
 .../libraries/fontconfig/make-fonts-cache.nix |  2 +-
 pkgs/development/libraries/frame/default.nix  |  2 +-
 .../libraries/freetype/default.nix            |  3 +-
 .../libraries/gbenchmark/default.nix          |  2 +-
 pkgs/development/libraries/gegl/default.nix   |  2 +-
 pkgs/development/libraries/geos/default.nix   |  2 +-
 pkgs/development/libraries/glib/default.nix   |  2 +-
 pkgs/development/libraries/glibc/common.nix   |  2 +-
 .../libraries/gnutls-kdh/generic.nix          |  4 +-
 pkgs/development/libraries/gnutls/generic.nix |  2 +-
 .../development/libraries/goffice/default.nix |  2 +-
 pkgs/development/libraries/gpgme/default.nix  |  2 +-
 pkgs/development/libraries/gsasl/default.nix  |  2 +-
 pkgs/development/libraries/gsl/default.nix    |  2 +-
 .../libraries/gstreamer/base/default.nix      |  2 +-
 .../legacy/gst-plugins-base/default.nix       |  2 +-
 .../legacy/gst-plugins-good/default.nix       |  4 +-
 .../legacy/gst-plugins-ugly/default.nix       |  2 +-
 .../libraries/gstreamer/vaapi/default.nix     |  2 +-
 pkgs/development/libraries/gtkd/default.nix   |  2 +-
 pkgs/development/libraries/gvfs/default.nix   |  2 +-
 .../libraries/hunspell/dictionaries.nix       |  1 +
 pkgs/development/libraries/icu/base.nix       |  2 +-
 .../libraries/ignition-transport/generic.nix  |  2 +-
 pkgs/development/libraries/ijs/default.nix    |  2 +-
 .../libraries/iso-codes/default.nix           |  2 +-
 pkgs/development/libraries/itk/default.nix    |  2 +-
 .../libraries/jbig2dec/default.nix            |  2 +-
 .../libraries/json-glib/default.nix           |  2 +-
 .../libraries/kde-frameworks/kcoreaddons.nix  |  2 +-
 .../libraries/kde-frameworks/kdeclarative.nix |  2 +-
 .../libraries/kde-frameworks/kglobalaccel.nix |  2 +-
 .../kde-frameworks/kpackage/default.nix       |  2 +-
 .../libraries/kde-frameworks/ktexteditor.nix  |  2 +-
 .../libraries/keybinder3/default.nix          |  2 +-
 .../development/libraries/kpmcore/default.nix |  2 +-
 .../development/libraries/kreport/default.nix |  2 +-
 .../libraries/languagemachines/frogdata.nix   |  2 -
 .../libraries/languagemachines/uctodata.nix   |  3 +-
 .../development/libraries/lensfun/default.nix |  2 +-
 .../libraries/libatomic_ops/default.nix       |  2 +-
 .../libraries/libbdplus/default.nix           |  2 +-
 pkgs/development/libraries/libbfd/default.nix |  4 +-
 .../libraries/libchamplain/default.nix        |  2 +-
 .../libraries/libcollectdclient/default.nix   |  2 +-
 .../libraries/libdazzle/default.nix           |  2 +-
 .../development/libraries/libedit/default.nix |  2 +-
 pkgs/development/libraries/libewf/default.nix |  2 +-
 .../libraries/libgdiplus/default.nix          |  2 +-
 .../development/libraries/libgksu/default.nix |  2 +-
 .../libraries/libgphoto2/default.nix          |  2 +-
 .../development/libraries/libgpod/default.nix |  2 +-
 .../development/libraries/libgtop/default.nix |  2 +-
 .../libraries/libiberty/default.nix           |  2 +-
 .../libraries/libid3tag/default.nix           |  2 +-
 .../development/libraries/libidn2/default.nix |  2 +-
 .../libraries/libircclient/default.nix        |  2 +-
 .../libraries/libjson-rpc-cpp/default.nix     |  2 +-
 .../libraries/libndctl/default.nix            |  2 +-
 .../libraries/libopcodes/default.nix          |  2 +-
 .../development/libraries/libopus/default.nix |  2 +-
 .../libraries/libplist/default.nix            |  2 +-
 pkgs/development/libraries/libpng/default.nix |  4 +-
 .../libraries/libproxy/default.nix            |  2 +-
 pkgs/development/libraries/librdf/raptor2.nix |  2 +-
 .../libraries/libsecret/default.nix           |  2 +-
 .../libraries/libsigcxx/default.nix           |  2 +-
 .../libraries/libsigsegv/default.nix          |  1 -
 pkgs/development/libraries/libskk/default.nix |  2 +-
 .../libraries/libsnark/default.nix            |  2 +-
 .../libraries/libtheora/default.nix           |  2 +-
 .../development/libraries/libtiff/default.nix |  2 +-
 .../libraries/libunwind/default.nix           |  2 +-
 .../libraries/libva-utils/default.nix         |  2 +-
 pkgs/development/libraries/libvpx/default.nix |  1 -
 pkgs/development/libraries/libvpx/git.nix     |  1 -
 .../development/libraries/libxml2/default.nix |  2 +-
 .../development/libraries/libxslt/default.nix |  2 +-
 .../libraries/libyaml-cpp/default.nix         |  2 +-
 .../development/libraries/libyaml/default.nix |  2 +-
 .../libraries/linenoise-ng/default.nix        |  2 +-
 pkgs/development/libraries/lirc/default.nix   |  2 +-
 .../libraries/lucene++/default.nix            |  2 +-
 .../libraries/mediastreamer/default.nix       |  2 +-
 .../libraries/mediastreamer/msopenh264.nix    |  2 +-
 .../libraries/mesa-darwin/default.nix         |  6 +-
 pkgs/development/libraries/mesa/default.nix   |  4 +-
 pkgs/development/libraries/mlt/default.nix    |  2 +-
 .../libraries/mono-zeroconf/default.nix       |  2 +-
 pkgs/development/libraries/mpich2/default.nix |  2 +-
 pkgs/development/libraries/mpir/default.nix   |  2 +-
 .../development/libraries/neardal/default.nix |  2 +-
 pkgs/development/libraries/ntrack/default.nix |  2 +-
 pkgs/development/libraries/odpic/default.nix  |  2 +-
 pkgs/development/libraries/opencv/3.x.nix     |  2 +-
 .../development/libraries/openexr/default.nix |  2 +-
 .../development/libraries/openpam/default.nix |  2 +-
 .../development/libraries/openssl/default.nix |  1 -
 .../libraries/opensubdiv/default.nix          |  2 +-
 pkgs/development/libraries/ortp/default.nix   |  2 +-
 pkgs/development/libraries/pango/default.nix  |  2 +-
 pkgs/development/libraries/pcre2/default.nix  |  2 +-
 .../libraries/physics/herwig/default.nix      |  2 +-
 .../libraries/physics/mcgrid/default.nix      |  2 +-
 .../libraries/physics/nlojet/default.nix      |  2 +-
 .../libraries/physics/yoda/default.nix        |  2 +-
 .../development/libraries/postgis/default.nix |  2 -
 .../libraries/protobuf/generic.nix            |  2 +-
 .../libraries/qimageblitz/default.nix         |  2 +-
 .../libraries/qt-4.x/4.8/default.nix          |  4 +-
 .../libraries/qt-5/5.11/default.nix           |  2 +-
 .../libraries/qt-5/5.6/default.nix            |  2 +-
 .../libraries/qt-5/5.9/default.nix            |  2 +-
 .../libraries/qt-5/modules/qtbase.nix         |  6 +-
 .../libraries/qt-5/modules/qtmultimedia.nix   |  1 -
 .../libraries/qt-5/modules/qtserialport.nix   |  2 +-
 .../libraries/qt-5/modules/qtwebkit.nix       |  1 -
 pkgs/development/libraries/qt-5/qt-env.nix    |  2 +-
 .../libraries/qtstyleplugins/default.nix      |  2 +-
 pkgs/development/libraries/quazip/default.nix |  2 +-
 .../libraries/quickder/default.nix            |  2 +-
 .../development/libraries/rocksdb/default.nix |  1 -
 .../libraries/science/math/arpack/default.nix |  2 +-
 .../libraries/science/math/caffe2/default.nix |  2 +-
 .../science/math/openblas/default.nix         |  2 +-
 .../science/networking/ns3/default.nix        |  2 +-
 pkgs/development/libraries/serf/default.nix   |  2 +-
 pkgs/development/libraries/smpeg2/default.nix |  2 +-
 .../libraries/speech-tools/default.nix        |  2 +-
 pkgs/development/libraries/spice/default.nix  |  2 +-
 .../development/libraries/tachyon/default.nix |  1 -
 pkgs/development/libraries/ti-rpc/default.nix |  2 +-
 .../libraries/unicorn-emu/default.nix         |  2 +-
 pkgs/development/libraries/v8/3.14.nix        |  2 +-
 pkgs/development/libraries/vigra/default.nix  |  2 +-
 pkgs/development/libraries/vtk/default.nix    |  2 +-
 .../development/libraries/wavpack/default.nix |  2 +-
 pkgs/development/libraries/wayland/1.9.nix    |  2 +-
 .../development/libraries/wayland/default.nix |  2 +-
 pkgs/development/libraries/wlc/default.nix    |  2 +-
 .../libraries/xcb-util-cursor/HEAD.nix        |  2 +-
 .../development/libraries/xgboost/default.nix |  1 -
 .../libraries/xine-lib/default.nix            |  2 +-
 .../lisp-modules/clwrapper/default.nix        |  2 +-
 .../quicklisp-to-nix-overrides.nix            |  2 +-
 pkgs/development/misc/loc/default.nix         |  2 +-
 .../mobile/titaniumenv/default.nix            |  2 +-
 .../examples/simulate-kitchensink/default.nix |  2 +-
 .../mobile/titaniumenv/titaniumsdk-6.3.nix    |  2 +-
 .../mobile/titaniumenv/titaniumsdk-7.1.nix    |  2 +-
 .../ocaml-modules/atdgen/default.nix          |  2 +-
 .../development/ocaml-modules/bap/default.nix |  2 +-
 .../ocaml-modules/bin_prot/default.nix        |  2 +-
 .../ocaml-modules/cohttp/default.nix          |  2 +-
 .../ocaml-modules/cstruct/1.9.0.nix           |  2 +-
 .../ocaml-modules/eliom/default.nix           |  2 +-
 .../ocaml-modules/erm_xmpp/0.3.nix            |  2 +-
 .../ocaml-modules/git-unix/default.nix        |  2 +-
 .../development/ocaml-modules/git/default.nix |  2 +-
 .../ocaml-modules/janestreet/async-extra.nix  |  2 +-
 .../ocaml-modules/janestreet/async-kernel.nix |  4 +-
 .../ocaml-modules/janestreet/async-unix.nix   |  2 +-
 .../ocaml-modules/janestreet/async.nix        |  2 +-
 .../ocaml-modules/janestreet/async_ssl.nix    |  4 +-
 .../janestreet/core-extended.nix              |  5 +-
 .../ocaml-modules/janestreet/core.nix         |  5 +-
 .../ocaml-modules/janestreet/core_kernel.nix  |  5 +-
 .../ocaml-modules/janestreet/default.nix      |  2 +-
 .../ocaml-modules/mysql/default.nix           |  2 +-
 .../ocaml-modules/ocaml-cairo/default.nix     |  2 +-
 .../ocaml-modules/piqi-ocaml/default.nix      |  2 +-
 .../ocaml-modules/ppx_import/default.nix      |  4 +-
 .../development/ocaml-modules/re2/default.nix |  2 +-
 .../development/ocaml-modules/tls/default.nix |  2 +-
 pkgs/development/perl-modules/MNI/default.nix |  2 +-
 pkgs/development/pharo/vm/build-vm.nix        |  2 +-
 pkgs/development/pure-modules/gen/default.nix |  2 +-
 .../development/pure-modules/glpk/default.nix |  2 +-
 .../python-modules/Cython/default.nix         |  1 -
 .../python-modules/GeoIP/default.nix          |  3 +-
 .../python-modules/JPype1/default.nix         |  2 +-
 .../python-modules/PyLD/default.nix           |  2 +-
 .../python-modules/Theano/default.nix         |  1 -
 .../python-modules/acme/default.nix           |  2 +-
 .../python-modules/aiohttp-jinja2/default.nix |  2 +-
 .../python-modules/aiohttp/cors.nix           |  2 +-
 .../python-modules/aiohue/default.nix         |  2 +-
 .../python-modules/anyjson/default.nix        |  2 +-
 .../python-modules/application/default.nix    |  2 +-
 .../python-modules/area53/default.nix         |  2 +-
 .../python-modules/argcomplete/default.nix    |  2 +-
 .../python-modules/argon2_cffi/default.nix    |  3 +-
 .../python-modules/asana/default.nix          |  2 +-
 .../python-modules/async_timeout/default.nix  |  1 -
 .../python-modules/asyncio/default.nix        |  2 +-
 .../python-modules/asynctest/default.nix      |  2 +-
 .../python-modules/autograd/default.nix       |  2 +-
 .../python-modules/behave/default.nix         |  2 +-
 .../bootstrapped-pip/default.nix              |  2 +-
 .../python-modules/bottleneck/default.nix     |  3 +-
 .../browsermob-proxy/default.nix              |  1 -
 .../python-modules/bz2file/default.nix        |  1 -
 .../python-modules/cachetools/default.nix     |  2 +-
 .../python-modules/can/default.nix            |  1 -
 .../python-modules/canmatrix/default.nix      |  1 -
 .../python-modules/canopen/default.nix        |  2 -
 .../python-modules/cdecimal/default.nix       |  2 +-
 .../python-modules/cffi/default.nix           |  2 +-
 .../python-modules/cftime/default.nix         |  3 +-
 .../python-modules/chainer/default.nix        |  2 +-
 .../python-modules/characteristic/default.nix |  3 +-
 .../python-modules/circus/default.nix         |  2 +-
 .../python-modules/cmd2/default.nix           |  4 +-
 pkgs/development/python-modules/cmd2/old.nix  |  2 +-
 .../python-modules/coinmarketcap/default.nix  |  2 +-
 .../python-modules/colorlover/default.nix     |  2 +-
 .../python-modules/configargparse/default.nix |  2 +-
 .../python-modules/configparser/default.nix   |  2 +-
 .../python-modules/construct/default.nix      |  2 +-
 .../python-modules/coverage/default.nix       |  1 -
 .../python-modules/cram/default.nix           |  2 +-
 .../python-modules/credstash/default.nix      |  2 +-
 .../cryptography_vectors/default.nix          |  1 -
 .../python-modules/cupy/default.nix           |  2 +-
 .../python-modules/cx_freeze/default.nix      |  2 +-
 .../python-modules/datadog/default.nix        |  2 +-
 .../python-modules/dateparser/default.nix     |  2 +-
 .../python-modules/debian/default.nix         |  2 +-
 .../python-modules/defusedxml/default.nix     |  2 +-
 .../python-modules/django_tagging/default.nix |  2 +-
 .../python-modules/dkimpy/default.nix         |  2 +-
 .../python-modules/dugong/default.nix         |  2 +-
 .../python-modules/ecpy/default.nix           |  2 +-
 .../email-validator/default.nix               |  2 +-
 .../python-modules/faulthandler/default.nix   |  2 +-
 .../python-modules/feedgen/default.nix        |  2 +-
 .../flake8-future-import/default.nix          |  3 +-
 .../python-modules/flask-migrate/default.nix  |  3 +-
 .../python-modules/flit/default.nix           |  1 -
 .../python-modules/fpdf/default.nix           |  2 +-
 .../python-modules/ftfy/default.nix           |  2 -
 .../python-modules/gensim/default.nix         |  3 -
 .../python-modules/graph-tool/2.x.x.nix       |  2 +-
 .../python-modules/h5py/default.nix           |  2 +-
 .../python-modules/hupper/default.nix         |  2 +-
 .../python-modules/hypchat/default.nix        |  2 +-
 .../python-modules/hypothesis/default.nix     |  4 +-
 .../python-modules/image-match/default.nix    |  2 +-
 .../python-modules/iowait/default.nix         |  2 +-
 pkgs/development/python-modules/ipython/5.nix |  2 -
 .../python-modules/joblib/default.nix         |  3 -
 .../python-modules/jsmin/default.nix          |  2 +-
 .../python-modules/jupyter_core/default.nix   |  1 -
 .../python-modules/jupyterhub/default.nix     |  2 -
 .../python-modules/kaitaistruct/default.nix   |  2 +-
 .../python-modules/keras/default.nix          |  2 +-
 .../python-modules/ldap/default.nix           |  2 +-
 .../python-modules/ldappool/default.nix       |  2 +-
 .../python-modules/libarcus/default.nix       |  4 +-
 .../python-modules/libgpuarray/default.nix    |  1 -
 .../python-modules/libversion/default.nix     |  2 +-
 .../python-modules/libvirt/default.nix        |  2 +-
 .../python-modules/linode-api/default.nix     |  1 -
 .../python-modules/lmtpd/default.nix          |  2 +-
 .../marionette-harness/default.nix            |  1 -
 .../marionette-harness/manifestparser.nix     |  1 -
 .../marionette-harness/marionette_driver.nix  |  1 -
 .../marionette-harness/mozcrash.nix           |  1 -
 .../marionette-harness/mozdevice.nix          |  1 -
 .../marionette-harness/mozfile.nix            |  1 -
 .../marionette-harness/mozhttpd.nix           |  1 -
 .../marionette-harness/mozlog.nix             |  1 -
 .../marionette-harness/moznetwork.nix         |  1 -
 .../marionette-harness/mozprocess.nix         |  1 -
 .../marionette-harness/mozprofile.nix         |  1 -
 .../marionette-harness/mozrunner.nix          |  1 -
 .../marionette-harness/moztest.nix            |  1 -
 .../marionette-harness/mozversion.nix         |  1 -
 .../python-modules/moto/default.nix           |  2 +-
 .../python-modules/mrbob/default.nix          |  2 +-
 .../python-modules/murmurhash/default.nix     |  1 -
 .../python-modules/nbconvert/default.nix      |  1 -
 .../python-modules/ncclient/default.nix       |  1 -
 .../python-modules/netdisco/default.nix       |  2 +-
 .../python-modules/nltk/default.nix           |  2 +-
 .../python-modules/numpy/default.nix          |  2 +-
 .../python-modules/ovh/default.nix            |  3 -
 .../python-modules/pandas/0.17.1.nix          |  2 -
 .../python-modules/pandas/default.nix         |  1 -
 .../python-modules/parse-type/default.nix     |  2 +-
 .../python-modules/parse/default.nix          |  2 +-
 .../python-modules/passlib/default.nix        |  3 +-
 .../python-modules/pelican/default.nix        |  2 +-
 .../python-modules/persistent/default.nix     |  1 -
 .../plaster-pastedeploy/default.nix           |  2 +-
 .../python-modules/plaster/default.nix        |  2 +-
 .../python-modules/pluggy/default.nix         |  1 -
 .../python-modules/plumbum/default.nix        |  3 +-
 .../python-modules/poppler-qt5/default.nix    |  2 +-
 .../python-modules/powerline/default.nix      |  3 -
 .../python-modules/progressbar2/default.nix   |  1 -
 .../prometheus_client/default.nix             |  2 +-
 .../python-modules/psutil/default.nix         |  1 -
 .../python-modules/pyGithub/default.nix       |  1 -
 .../python-modules/pyaml/default.nix          |  1 -
 .../python-modules/pycaption/default.nix      |  2 +-
 .../python-modules/pycollada/default.nix      |  2 +-
 .../python-modules/pycrypto/default.nix       |  2 +-
 .../python-modules/pycryptodome/default.nix   |  2 +-
 .../python-modules/pygame/default.nix         |  2 +-
 .../python-modules/pygame_sdl2/default.nix    |  2 +-
 .../python-modules/pygccxml/default.nix       |  2 +-
 .../python-modules/pygobject/3.nix            |  2 +-
 .../python-modules/pymc3/default.nix          |  1 -
 .../python-modules/pymvglive/default.nix      |  2 +-
 .../python-modules/pynacl/default.nix         |  2 +-
 .../python-modules/pyogg/default.nix          |  2 +-
 .../python-modules/pyowm/default.nix          |  2 +-
 pkgs/development/python-modules/pyqt/5.x.nix  |  2 +-
 .../python-modules/pysc2/default.nix          |  1 -
 .../python-modules/pysdl2/default.nix         |  2 +-
 .../python-modules/pyside/default.nix         |  2 +-
 .../python-modules/pytest-cram/default.nix    |  2 +-
 .../python-modules/pytest-flake8/default.nix  |  2 +-
 .../python-modules/pytest-mock/default.nix    |  2 +-
 .../python-modules/pytest-xdist/default.nix   |  2 +-
 .../python-modules/python-oauth2/default.nix  |  1 -
 .../python-modules/pytorch/default.nix        |  4 +-
 .../python-modules/pywbem/default.nix         |  2 +-
 .../python-modules/pyxml/default.nix          |  2 +-
 .../python-modules/pyzmq/default.nix          |  3 +-
 .../python-modules/qiskit/default.nix         |  2 -
 .../python-modules/rdflib/default.nix         |  3 +-
 .../python-modules/redis/default.nix          |  2 +-
 .../python-modules/reportlab/default.nix      |  4 +-
 .../python-modules/requests-mock/default.nix  |  2 +-
 .../python-modules/responses/default.nix      |  2 +-
 .../python-modules/rhpl/default.nix           |  2 +-
 .../python-modules/rubymarshal/default.nix    |  2 +-
 .../python-modules/salmon-mail/default.nix    |  2 +-
 .../python-modules/scikit-image/default.nix   |  1 -
 .../python-modules/scikitlearn/default.nix    |  2 +-
 .../python-modules/scipy/default.nix          |  2 +-
 .../serversyncstorage/default.nix             |  3 +-
 .../python-modules/smart_open/default.nix     |  1 -
 .../python-modules/spacy/default.nix          |  2 -
 .../python-modules/sqlalchemy/default.nix     |  1 -
 .../python-modules/sseclient/default.nix      |  2 +-
 .../python-modules/syncserver/default.nix     |  3 +-
 .../python-modules/tempora/default.nix        |  2 +-
 .../python-modules/tensorflow/bin.nix         |  2 +-
 .../python-modules/testfixtures/default.nix   |  2 +-
 .../python-modules/textacy/default.nix        |  1 -
 .../python-modules/thespian/default.nix       |  2 +-
 .../python-modules/thinc/default.nix          |  2 -
 .../python-modules/tiros/default.nix          |  2 +-
 .../python-modules/todoist/default.nix        |  2 +-
 .../python-modules/tokenserver/default.nix    |  3 +-
 .../python-modules/tox/default.nix            |  3 +-
 .../python-modules/tqdm/default.nix           |  2 -
 .../python-modules/typed-ast/default.nix      |  2 +-
 .../python-modules/tzlocal/default.nix        |  2 +-
 .../ukpostcodeparser/default.nix              |  2 +-
 .../python-modules/uranium/default.nix        |  2 +-
 .../python-modules/vcrpy/default.nix          |  1 -
 .../python-modules/warrant/default.nix        |  2 +-
 .../python-modules/wptserve/default.nix       |  1 -
 .../python-modules/wsproto/default.nix        |  2 +-
 .../python-modules/xarray/default.nix         |  1 -
 .../python-modules/zeep/default.nix           |  1 -
 .../python-modules/zodb/default.nix           |  1 -
 .../zope_testrunner/default.nix               |  1 -
 pkgs/development/r-modules/default.nix        |  4 +-
 .../ruby-modules/bundler/default.nix          |  2 +-
 .../tools/analysis/qcachegrind/default.nix    |  2 +-
 .../tools/analysis/radare/default.nix         |  2 +-
 .../tools/analysis/valgrind/default.nix       |  2 +-
 .../tools/backblaze-b2/default.nix            |  2 +-
 pkgs/development/tools/bloaty/default.nix     |  2 +-
 .../tools/build-managers/buck/default.nix     |  2 +-
 .../tools/build-managers/buildbot/default.nix |  2 +-
 .../tools/build-managers/cmake/2.8.nix        |  2 +-
 .../tools/build-managers/conan/default.nix    |  2 +-
 .../tools/build-managers/dub/default.nix      |  2 +-
 .../tools/build-managers/meson/default.nix    |  2 +-
 .../tools/build-managers/nant/default.nix     |  2 +-
 .../tools/build-managers/pants/default.nix    |  2 +-
 .../tools/build-managers/rebar3/default.nix   |  4 +-
 .../tools/build-managers/scons/common.nix     |  2 +-
 .../tools/build-managers/scons/default.nix    |  2 +-
 .../tools/build-managers/waf/default.nix      |  2 +-
 pkgs/development/tools/buildah/default.nix    |  2 +-
 pkgs/development/tools/castxml/default.nix    |  1 -
 pkgs/development/tools/chefdk/default.nix     |  2 +-
 pkgs/development/tools/compass/default.nix    |  2 +-
 .../default.nix                               |  2 +-
 .../tools/database/liquibase/default.nix      |  2 +-
 pkgs/development/tools/delve/default.nix      |  2 +-
 .../tools/devpi-client/default.nix            |  1 -
 .../tools/devpi-server/default.nix            |  2 +-
 .../documentation/gnome-doc-utils/default.nix |  4 +-
 pkgs/development/tools/easyjson/default.nix   |  2 +-
 .../tools/egg2nix/chicken-eggs.nix            |  2 +-
 pkgs/development/tools/electron/default.nix   |  2 +-
 .../tools/erlang/hex2nix/default.nix          |  2 +-
 .../tools/erlang/relx-exe/default.nix         |  2 +-
 pkgs/development/tools/fac/default.nix        |  2 +-
 pkgs/development/tools/git-ftp/default.nix    |  2 +-
 pkgs/development/tools/go-bindata/default.nix |  2 +-
 pkgs/development/tools/go-outline/default.nix |  2 +-
 .../tools/go-repo-root/default.nix            |  2 +-
 pkgs/development/tools/go-symbols/default.nix |  2 +-
 pkgs/development/tools/gocode/default.nix     |  2 +-
 pkgs/development/tools/goconvey/default.nix   |  2 +-
 pkgs/development/tools/godef/default.nix      |  2 +-
 pkgs/development/tools/goimports/default.nix  |  2 +-
 pkgs/development/tools/golint/default.nix     |  2 +-
 .../tools/gomodifytags/default.nix            |  2 +-
 pkgs/development/tools/gopkgs/default.nix     |  2 +-
 pkgs/development/tools/gotags/default.nix     |  2 +-
 pkgs/development/tools/gotests/default.nix    |  2 +-
 pkgs/development/tools/gotools/default.nix    |  2 +-
 pkgs/development/tools/govers/default.nix     |  2 +-
 pkgs/development/tools/gox/default.nix        |  2 +-
 .../tools/haskell/hyper-haskell/default.nix   |  2 +-
 .../tools/haskell/lambdabot/default.nix       |  2 +-
 .../haskell/multi-ghc-travis/default.nix      |  2 +-
 pkgs/development/tools/hexio/default.nix      |  2 +-
 pkgs/development/tools/iaca/2.1.nix           |  2 +-
 pkgs/development/tools/iaca/3.0.nix           |  2 +-
 .../tools/irony-server/default.nix            |  2 +-
 pkgs/development/tools/jmespath/default.nix   |  2 +-
 pkgs/development/tools/jp/default.nix         |  2 +-
 pkgs/development/tools/json2hcl/default.nix   |  2 +-
 pkgs/development/tools/kube-aws/default.nix   |  2 +-
 pkgs/development/tools/leaps/default.nix      |  2 +-
 .../tools/librarian-puppet-go/default.nix     |  2 +-
 pkgs/development/tools/manul/default.nix      |  2 +-
 .../tools/misc/autogen/default.nix            |  2 +-
 .../tools/misc/automake/automake-1.16.x.nix   |  2 +-
 .../tools/misc/binutils/default.nix           |  2 +-
 .../tools/misc/blackmagic/default.nix         |  2 +-
 .../tools/misc/cbrowser/default.nix           |  2 +-
 .../development/tools/misc/ccache/default.nix |  2 +-
 .../development/tools/misc/cquery/default.nix |  2 +-
 pkgs/development/tools/misc/ctags/wrapped.nix |  2 +-
 .../development/tools/misc/dialog/default.nix |  2 +-
 .../tools/misc/fswatch/default.nix            |  2 +-
 .../development/tools/misc/global/default.nix |  2 +-
 pkgs/development/tools/misc/hydra/default.nix |  4 +-
 .../tools/misc/intel-gpu-tools/default.nix    |  2 +-
 .../tools/misc/linuxkit/default.nix           |  2 +-
 .../tools/misc/loccount/default.nix           |  2 +-
 .../development/tools/misc/md2man/default.nix |  2 +-
 pkgs/development/tools/misc/moby/default.nix  |  2 +-
 .../tools/misc/pkgconfig/default.nix          |  2 +-
 .../tools/misc/stm32flash/default.nix         |  2 +-
 pkgs/development/tools/misc/swig/3.x.nix      |  2 +-
 .../tools/misc/teensy-loader-cli/default.nix  |  2 +-
 pkgs/development/tools/misc/trv/default.nix   |  2 +-
 pkgs/development/tools/nailgun/default.nix    |  2 +-
 pkgs/development/tools/node-webkit/nw12.nix   |  2 +-
 pkgs/development/tools/nwjs/default.nix       |  6 +-
 .../tools/ocaml/camlidl/default.nix           |  2 +-
 pkgs/development/tools/ocaml/opam/default.nix |  2 +-
 pkgs/development/tools/ocaml/utop/default.nix |  2 +-
 pkgs/development/tools/parsing/bison/3.x.nix  |  2 +-
 .../tools/parsing/hammer/default.nix          |  2 +-
 .../tools/quicktemplate/default.nix           |  2 +-
 pkgs/development/tools/redis-dump/default.nix |  2 +-
 pkgs/development/tools/rtags/default.nix      |  2 +-
 pkgs/development/tools/rubocop/default.nix    |  2 +-
 .../tools/rust/rainicorn/default.nix          |  2 +-
 .../tools/selenium/server/default.nix         |  2 +-
 pkgs/development/tools/slimerjs/default.nix   |  2 +-
 pkgs/development/tools/textql/default.nix     |  2 +-
 pkgs/development/tools/vim-vint/default.nix   |  2 +-
 pkgs/development/tools/vndr/default.nix       |  2 +-
 pkgs/development/tools/ws/default.nix         |  2 +-
 pkgs/development/tools/xcbuild/wrapper.nix    |  2 +-
 pkgs/development/tools/xib2nib/default.nix    |  2 +-
 pkgs/development/tools/yq/default.nix         |  2 +-
 pkgs/development/web/minify/default.nix       |  2 +-
 pkgs/development/web/postman/default.nix      |  2 +-
 pkgs/games/0ad/game.nix                       |  2 +-
 pkgs/games/90secondportraits/default.nix      |  2 +-
 pkgs/games/commandergenius/default.nix        |  2 +-
 pkgs/games/dwarf-fortress/default.nix         |  6 +-
 pkgs/games/dwarf-fortress/dfhack/default.nix  |  2 +-
 .../dwarf-therapist/default.nix               |  2 +-
 .../dwarf-therapist/wrapper.nix               |  2 +-
 pkgs/games/dwarf-fortress/lazy-pack.nix       |  2 +-
 pkgs/games/dwarf-fortress/themes/default.nix  |  2 +-
 pkgs/games/gcs/default.nix                    |  1 -
 pkgs/games/gzdoom/default.nix                 |  2 +-
 pkgs/games/meritous/default.nix               |  2 +-
 pkgs/games/mnemosyne/default.nix              |  3 +-
 pkgs/games/mrrescue/default.nix               |  2 +-
 pkgs/games/nethack/default.nix                |  2 +-
 pkgs/games/opendune/default.nix               |  2 +-
 pkgs/games/openmw/default.nix                 |  2 +-
 pkgs/games/openrct2/default.nix               |  2 +-
 pkgs/games/openspades/default.nix             |  2 +-
 pkgs/games/openxcom/default.nix               |  2 +-
 pkgs/games/pokerth/default.nix                |  2 +-
 pkgs/games/quake3/wrapper/default.nix         |  2 +-
 pkgs/games/rigsofrods/default.nix             |  4 +-
 pkgs/games/sienna/default.nix                 |  2 +-
 pkgs/games/spring/default.nix                 |  2 +-
 pkgs/games/spring/springlobby.nix             |  2 +-
 pkgs/games/stepmania/default.nix              |  2 +-
 pkgs/games/tibia/default.nix                  |  2 +-
 pkgs/games/torcs/default.nix                  |  2 +-
 pkgs/games/uqm/default.nix                    |  2 +-
 pkgs/games/vdrift/default.nix                 |  2 +-
 pkgs/games/wesnoth/default.nix                |  2 +-
 pkgs/games/widelands/default.nix              |  2 +-
 pkgs/games/worldofgoo/default.nix             |  2 +-
 pkgs/games/xonotic/default.nix                |  2 +-
 pkgs/games/zandronum/sqlite.nix               |  2 +-
 pkgs/misc/cups/drivers/brlaser/default.nix    |  2 +-
 pkgs/misc/cups/drivers/hl1110/default.nix     |  2 +-
 .../cups/drivers/mfcj470dwlpr/default.nix     |  2 +-
 .../cups/drivers/mfcj6510dwlpr/default.nix    |  2 +-
 pkgs/misc/cups/drivers/samsung/default.nix    |  2 +-
 pkgs/misc/cups/drivers/splix/default.nix      |  2 +-
 pkgs/misc/cups/filters.nix                    |  2 +-
 pkgs/misc/drivers/epson-alc1100/default.nix   |  2 +-
 pkgs/misc/drivers/hplip/3.16.11.nix           |  5 +-
 pkgs/misc/drivers/hplip/default.nix           |  3 +-
 .../drivers/postscript-lexmark/default.nix    |  2 +-
 pkgs/misc/emulators/cdemu/analyzer.nix        |  2 +-
 pkgs/misc/emulators/cdemu/gui.nix             |  2 +-
 pkgs/misc/emulators/cdemu/vhba.nix            |  2 +-
 pkgs/misc/emulators/dosbox/unstable.nix       |  2 +-
 pkgs/misc/emulators/epsxe/default.nix         |  2 +-
 pkgs/misc/emulators/mupen64plus/default.nix   |  2 +-
 pkgs/misc/emulators/nestopia/default.nix      |  4 +-
 pkgs/misc/emulators/qmc2/default.nix          |  2 +-
 pkgs/misc/emulators/retrofe/default.nix       |  2 +-
 pkgs/misc/emulators/vbam/default.nix          |  4 --
 pkgs/misc/emulators/vice/default.nix          |  2 +-
 pkgs/misc/emulators/wine/default.nix          |  2 +-
 pkgs/misc/emulators/wine/packages.nix         |  2 +-
 pkgs/misc/emulators/wine/staging.nix          |  2 +-
 pkgs/misc/ghostscript/default.nix             |  2 +-
 pkgs/misc/jackaudio/default.nix               |  1 -
 pkgs/misc/lilypond/unstable.nix               |  2 +-
 pkgs/misc/my-env/default.nix                  |  2 +-
 pkgs/misc/phabricator/default.nix             |  2 +-
 pkgs/misc/screensavers/slock/default.nix      |  2 +-
 pkgs/misc/themes/vertex/default.nix           |  2 +-
 pkgs/misc/uboot/default.nix                   |  2 +-
 pkgs/misc/vim-plugins/default.nix             |  6 +-
 .../vscode-extensions/cpptools/default.nix    |  2 +-
 pkgs/misc/vscode-extensions/default.nix       |  2 +-
 .../misc/vscode-extensions/python/default.nix |  2 +-
 pkgs/misc/vscode-extensions/vscode-utils.nix  |  2 +-
 .../apple-source-releases/ICU/default.nix     |  2 +-
 .../apple-source-releases/Libc/825_40_1.nix   |  2 +-
 .../apple-source-releases/Libc/default.nix    |  2 +-
 .../apple-source-releases/Libinfo/default.nix |  2 +-
 .../apple-source-releases/Libm/default.nix    |  2 +-
 .../Libnotify/default.nix                     |  2 +-
 .../Libsystem/default.nix                     |  4 +-
 .../Security/default.nix                      |  2 +-
 .../adv_cmds/default.nix                      |  2 +-
 .../apple-source-releases/adv_cmds/xcode.nix  |  2 +-
 .../basic_cmds/default.nix                    |  2 +-
 .../apple-source-releases/bsdmake/default.nix |  2 +-
 .../copyfile/default.nix                      |  2 +-
 .../developer_cmds/default.nix                |  2 +-
 .../diskdev_cmds/default.nix                  |  2 +-
 .../apple-source-releases/dtrace/default.nix  |  2 +-
 .../eap8021x/default.nix                      |  2 +-
 .../apple-source-releases/launchd/default.nix |  2 +-
 .../libclosure/default.nix                    |  2 +-
 .../libdispatch/default.nix                   |  2 +-
 .../libiconv/default.nix                      |  2 +-
 .../libplatform/default.nix                   |  2 +-
 .../libresolv/default.nix                     |  2 +-
 .../libsecurity_cdsa_utils/default.nix        |  2 +-
 .../libsecurity_cssm/default.nix              |  2 +-
 .../libsecurity_keychain/default.nix          |  2 +-
 .../libsecurity_utilities/default.nix         |  2 +-
 .../mDNSResponder/default.nix                 |  2 +-
 .../apple-source-releases/objc4/default.nix   |  2 +-
 .../apple-source-releases/ppp/default.nix     |  2 +-
 .../removefile/default.nix                    |  2 +-
 .../system_cmds/default.nix                   |  2 +-
 .../text_cmds/default.nix                     |  2 +-
 .../apple-source-releases/xnu/default.nix     |  2 +-
 pkgs/os-specific/darwin/binutils/default.nix  |  1 -
 pkgs/os-specific/darwin/cctools/port.nix      |  4 +-
 pkgs/os-specific/darwin/darling/default.nix   |  2 +-
 .../darwin/security-tool/default.nix          |  2 +-
 .../darwin/swift-corelibs/default.nix         |  2 +-
 pkgs/os-specific/darwin/xcode/sdk-pkgs.nix    |  2 +-
 pkgs/os-specific/linux/amdgpu-pro/default.nix |  2 +-
 pkgs/os-specific/linux/autofs/default.nix     |  2 +-
 pkgs/os-specific/linux/bcc/default.nix        |  2 +-
 pkgs/os-specific/linux/blcr/default.nix       |  2 +-
 .../linux/broadcom-sta/default.nix            |  2 +-
 pkgs/os-specific/linux/busybox/default.nix    |  3 +-
 pkgs/os-specific/linux/checksec/default.nix   |  2 +-
 pkgs/os-specific/linux/conky/default.nix      |  2 +-
 pkgs/os-specific/linux/cpupower/default.nix   |  2 +-
 pkgs/os-specific/linux/criu/default.nix       |  2 +-
 pkgs/os-specific/linux/cryptodev/default.nix  |  2 +-
 .../os-specific/linux/dbus-broker/default.nix |  2 +-
 .../os-specific/linux/displaylink/default.nix |  2 +-
 pkgs/os-specific/linux/ena/default.nix        |  2 +-
 pkgs/os-specific/linux/fatrace/default.nix    |  2 +-
 .../firmware-linux-nonfree/default.nix        |  2 +-
 pkgs/os-specific/linux/fuse/common.nix        |  1 -
 pkgs/os-specific/linux/fuse/default.nix       |  2 +-
 pkgs/os-specific/linux/guvcview/default.nix   |  4 +-
 pkgs/os-specific/linux/iproute/default.nix    |  2 +-
 pkgs/os-specific/linux/iputils/default.nix    |  2 +-
 .../linux/kernel-headers/default.nix          |  2 +-
 .../linux/kernel/manual-config.nix            |  3 +-
 pkgs/os-specific/linux/kernel/patches.nix     |  2 +-
 pkgs/os-specific/linux/keyutils/default.nix   |  2 +-
 pkgs/os-specific/linux/lvm2/default.nix       |  2 +-
 pkgs/os-specific/linux/lxc/default.nix        |  2 +-
 pkgs/os-specific/linux/mbpfan/default.nix     |  2 +-
 pkgs/os-specific/linux/microcode/amd.nix      |  2 +-
 .../linux/mkinitcpio-nfs-utils/default.nix    |  2 +-
 pkgs/os-specific/linux/musl/default.nix       |  1 -
 pkgs/os-specific/linux/nvidia-x11/default.nix |  2 +-
 pkgs/os-specific/linux/nvidia-x11/generic.nix |  2 +-
 .../linux/nvidia-x11/persistenced.nix         |  2 +-
 .../os-specific/linux/openvswitch/default.nix |  2 +-
 pkgs/os-specific/linux/ply/default.nix        |  2 +-
 pkgs/os-specific/linux/pmount/default.nix     |  2 +-
 pkgs/os-specific/linux/prl-tools/default.nix  |  3 +-
 pkgs/os-specific/linux/rtl8812au/default.nix  |  2 +-
 pkgs/os-specific/linux/rtl8814au/default.nix  |  2 +-
 .../linux/service-wrapper/default.nix         |  2 +-
 pkgs/os-specific/linux/seturgent/default.nix  |  2 +-
 pkgs/os-specific/linux/sssd/default.nix       |  6 +-
 pkgs/os-specific/linux/sysdig/default.nix     |  2 +-
 pkgs/os-specific/linux/systemd/default.nix    |  4 +-
 pkgs/os-specific/linux/tbs/default.nix        |  2 +-
 .../os-specific/linux/thunderbolt/default.nix |  1 -
 pkgs/os-specific/linux/trinity/default.nix    |  2 +-
 pkgs/os-specific/linux/udisks/2-default.nix   |  2 +-
 pkgs/os-specific/linux/upower/default.nix     |  2 +-
 pkgs/os-specific/linux/util-linux/default.nix |  2 +-
 pkgs/os-specific/linux/virtualbox/default.nix |  2 +-
 pkgs/os-specific/linux/wireguard/default.nix  |  2 +-
 .../linux/wpa_supplicant/default.nix          |  2 +-
 pkgs/os-specific/linux/wpa_supplicant/gui.nix |  2 +-
 .../linux/xf86-input-wacom/default.nix        |  2 +-
 .../windows/pthread-w32/default.nix           |  2 +-
 pkgs/servers/amqp/rabbitmq-server/default.nix |  2 +-
 pkgs/servers/asterisk/default.nix             |  2 +-
 pkgs/servers/caddy/default.nix                |  2 +-
 pkgs/servers/computing/storm/default.nix      |  4 +-
 pkgs/servers/consul/default.nix               |  2 +-
 pkgs/servers/dict/dictd-wordnet.nix           |  2 +-
 pkgs/servers/dns/knot-resolver/default.nix    |  2 +-
 pkgs/servers/dns/nsd/default.nix              |  2 +-
 pkgs/servers/etcd/default.nix                 |  2 +-
 pkgs/servers/exhibitor/default.nix            |  2 +-
 pkgs/servers/firebird/default.nix             |  2 +-
 pkgs/servers/gotty/default.nix                |  2 +-
 pkgs/servers/h2/default.nix                   |  2 +-
 pkgs/servers/hbase/default.nix                |  2 +-
 pkgs/servers/home-assistant/appdaemon.nix     |  2 +-
 pkgs/servers/http/couchdb/default.nix         |  2 +-
 .../servers/http/jboss/jdbc/mysql/default.nix |  2 +-
 pkgs/servers/http/nginx/generic.nix           |  3 +-
 pkgs/servers/http/nginx/modules.nix           |  2 +-
 .../servers/http/nix-binary-cache/default.nix |  2 +-
 pkgs/servers/http/openresty/default.nix       |  2 +-
 pkgs/servers/interlock/default.nix            |  2 +-
 pkgs/servers/isso/default.nix                 |  2 +-
 pkgs/servers/ldap/389/default.nix             |  2 +-
 pkgs/servers/mail/dovecot/default.nix         |  2 +-
 pkgs/servers/mail/mlmmj/default.nix           |  2 +-
 pkgs/servers/matrix-synapse/default.nix       |  2 +-
 pkgs/servers/mesos-dns/default.nix            |  2 +-
 pkgs/servers/mirrorbits/default.nix           |  2 +-
 pkgs/servers/monitoring/cadvisor/default.nix  |  2 +-
 .../monitoring/consul-alerts/default.nix      |  2 +-
 .../monitoring/fusion-inventory/default.nix   |  2 +-
 pkgs/servers/monitoring/kapacitor/default.nix |  2 +-
 pkgs/servers/monitoring/lcdproc/default.nix   |  2 +-
 .../monitoring/plugins/labs_consol_de.nix     |  2 +-
 .../prometheus/blackbox-exporter.nix          |  2 +-
 .../prometheus/collectd-exporter.nix          |  2 +-
 .../prometheus/fritzbox-exporter.nix          |  2 +-
 .../monitoring/prometheus/json-exporter.nix   |  2 +-
 .../monitoring/prometheus/mesos-exporter.nix  |  2 +-
 .../prometheus/minio-exporter/default.nix     |  2 +-
 .../monitoring/prometheus/prom2json.nix       |  2 +-
 .../monitoring/prometheus/snmp-exporter.nix   |  2 +-
 .../monitoring/prometheus/statsd-bridge.nix   |  2 +-
 .../prometheus/surfboard-exporter.nix         |  2 +-
 .../prometheus/unifi-exporter/default.nix     |  2 +-
 .../prometheus/varnish-exporter.nix           |  2 +-
 pkgs/servers/monitoring/zabbix/2.0.nix        |  2 +-
 pkgs/servers/monitoring/zabbix/2.2.nix        |  2 +-
 pkgs/servers/monitoring/zabbix/3.4.nix        |  2 +-
 pkgs/servers/mpd/default.nix                  |  2 +-
 pkgs/servers/nextcloud/default.nix            |  2 +-
 pkgs/servers/nosql/arangodb/default.nix       |  2 +-
 pkgs/servers/nosql/eventstore/default.nix     |  2 +-
 pkgs/servers/nosql/mongodb/default.nix        |  2 +-
 pkgs/servers/nosql/rethinkdb/default.nix      |  2 +-
 pkgs/servers/nosql/riak-cs/2.1.1.nix          |  2 +-
 pkgs/servers/nosql/riak-cs/stanchion.nix      |  2 +-
 pkgs/servers/nosql/riak/2.2.0.nix             |  2 +-
 pkgs/servers/nsq/default.nix                  |  2 +-
 pkgs/servers/openafs/1.6/default.nix          |  2 +-
 pkgs/servers/openafs/1.8/default.nix          |  2 +-
 pkgs/servers/pulseaudio/default.nix           |  3 -
 pkgs/servers/rippled/data-api.nix             |  2 +-
 pkgs/servers/rippled/package.nix              |  2 +-
 pkgs/servers/samba/4.x.nix                    |  4 +-
 pkgs/servers/samba/master.nix                 |  2 +-
 pkgs/servers/search/elasticsearch/plugins.nix |  2 +-
 pkgs/servers/skydns/default.nix               |  2 +-
 pkgs/servers/sql/mariadb/default.nix          |  2 +-
 pkgs/servers/x11/xquartz/default.nix          |  4 +-
 pkgs/shells/bash/4.4.nix                      |  1 -
 pkgs/shells/elvish/default.nix                |  2 +-
 pkgs/shells/fish/default.nix                  |  2 +-
 pkgs/shells/oh/default.nix                    |  2 +-
 pkgs/shells/oil/default.nix                   |  2 +-
 pkgs/shells/powershell/default.nix            |  2 +-
 pkgs/shells/zsh/antibody/default.nix          |  2 +-
 pkgs/shells/zsh/zsh-powerlevel9k/default.nix  |  2 +-
 pkgs/shells/zsh/zsh-prezto/default.nix        |  2 +-
 pkgs/tools/X11/bumblebee/default.nix          |  5 +-
 pkgs/tools/X11/go-sct/default.nix             |  2 +-
 pkgs/tools/X11/primus/default.nix             |  1 -
 pkgs/tools/X11/setroot/default.nix            |  2 +-
 pkgs/tools/X11/vdpauinfo/default.nix          |  2 +-
 pkgs/tools/X11/xbindkeys-config/default.nix   |  2 +-
 pkgs/tools/X11/xdg-utils/default.nix          |  2 +-
 pkgs/tools/X11/xpra/default.nix               |  2 +-
 pkgs/tools/X11/xpra/gtk3.nix                  |  2 +-
 pkgs/tools/admin/ansible/default.nix          |  2 +-
 pkgs/tools/admin/dehydrated/default.nix       |  2 +-
 pkgs/tools/admin/gtk-vnc/default.nix          |  4 +-
 pkgs/tools/admin/intecture/agent.nix          |  2 +-
 pkgs/tools/admin/intecture/auth.nix           |  2 +-
 pkgs/tools/admin/intecture/cli.nix            |  2 +-
 pkgs/tools/admin/lxd/default.nix              |  2 +-
 pkgs/tools/admin/simp_le/default.nix          |  2 +-
 pkgs/tools/admin/ssl-cert-check/default.nix   |  1 -
 pkgs/tools/archivers/innoextract/default.nix  |  2 +-
 pkgs/tools/archivers/rpmextract/default.nix   |  2 +-
 pkgs/tools/archivers/unp/default.nix          |  2 +-
 pkgs/tools/archivers/zpaq/zpaqd.nix           |  2 +-
 pkgs/tools/backup/bareos/default.nix          |  2 +-
 pkgs/tools/backup/ddar/default.nix            |  2 +-
 pkgs/tools/backup/partimage/default.nix       |  1 -
 pkgs/tools/backup/rsnapshot/default.nix       |  2 +-
 .../backup/ugarit-manifest-maker/default.nix  |  2 +-
 .../backup/ugarit-manifest-maker/eggs.nix     |  2 +-
 pkgs/tools/backup/ugarit/default.nix          |  2 +-
 pkgs/tools/backup/ugarit/eggs.nix             |  2 +-
 pkgs/tools/backup/znapzend/default.nix        |  2 +-
 pkgs/tools/bluetooth/blueman/default.nix      |  2 +-
 pkgs/tools/bootloaders/refind/default.nix     |  2 +-
 pkgs/tools/cd-dvd/brasero/default.nix         |  2 +-
 pkgs/tools/compression/bzip2/default.nix      |  2 +-
 pkgs/tools/compression/gzip/default.nix       |  2 +-
 pkgs/tools/compression/lzbench/default.nix    |  2 +-
 pkgs/tools/compression/upx/default.nix        |  2 +-
 .../filesystems/bcachefs-tools/default.nix    |  2 +-
 pkgs/tools/filesystems/ceph/generic.nix       |  8 +--
 pkgs/tools/filesystems/fatresize/default.nix  |  2 +-
 pkgs/tools/filesystems/glusterfs/default.nix  |  2 +-
 pkgs/tools/filesystems/go-mtpfs/default.nix   |  2 +-
 pkgs/tools/filesystems/grive2/default.nix     |  2 +-
 pkgs/tools/filesystems/irods/default.nix      |  2 +-
 .../tools/filesystems/nixpart/0.4/default.nix |  2 -
 pkgs/tools/filesystems/squashfuse/default.nix |  4 +-
 pkgs/tools/filesystems/xtreemfs/default.nix   |  2 +-
 pkgs/tools/filesystems/zkfuse/default.nix     |  2 +-
 pkgs/tools/graphics/argyllcms/default.nix     |  2 +-
 pkgs/tools/graphics/cuneiform/default.nix     |  2 +-
 pkgs/tools/graphics/gmic/default.nix          |  2 +-
 pkgs/tools/graphics/gnuplot/default.nix       |  1 -
 pkgs/tools/graphics/jbig2enc/default.nix      |  2 +-
 pkgs/tools/graphics/pywal/default.nix         |  2 +-
 pkgs/tools/graphics/vips/default.nix          |  4 +-
 .../fcitx-engines/fcitx-mozc/default.nix      |  2 +-
 pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix   |  2 +-
 pkgs/tools/inputmethods/fcitx/unwrapped.nix   |  2 +-
 pkgs/tools/inputmethods/fcitx/wrapper.nix     |  2 +-
 .../ibus-engines/ibus-hangul/default.nix      |  2 +-
 .../ibus-engines/ibus-mozc/default.nix        |  2 +-
 pkgs/tools/inputmethods/ibus/default.nix      |  2 +-
 .../interception-tools/default.nix            |  2 +-
 pkgs/tools/misc/apt-offline/default.nix       |  2 +-
 pkgs/tools/misc/azure-vhd-utils/default.nix   |  2 +-
 pkgs/tools/misc/bibutils/default.nix          |  2 +-
 pkgs/tools/misc/byobu/default.nix             |  2 +-
 pkgs/tools/misc/colord/default.nix            |  2 +-
 pkgs/tools/misc/dashing/default.nix           |  2 +-
 pkgs/tools/misc/debootstrap/default.nix       |  2 +-
 pkgs/tools/misc/direnv/default.nix            |  2 +-
 pkgs/tools/misc/dust/default.nix              |  2 +-
 pkgs/tools/misc/fluentd/default.nix           |  2 +-
 pkgs/tools/misc/fontforge/default.nix         |  2 +-
 pkgs/tools/misc/fzf/default.nix               |  2 +-
 pkgs/tools/misc/gams/default.nix              |  2 +-
 pkgs/tools/misc/gawp/default.nix              |  2 +-
 pkgs/tools/misc/gh-ost/default.nix            |  2 +-
 pkgs/tools/misc/gosu/default.nix              |  2 +-
 pkgs/tools/misc/graylog/plugins.nix           |  2 +-
 pkgs/tools/misc/grub/2.0x.nix                 |  2 +-
 pkgs/tools/misc/hdf5/1_8.nix                  |  1 -
 pkgs/tools/misc/hdf5/default.nix              |  1 -
 pkgs/tools/misc/hdfview/default.nix           |  2 +-
 pkgs/tools/misc/i3cat/default.nix             |  2 +-
 .../misc/libbitcoin/libbitcoin-client.nix     |  2 +-
 .../misc/libbitcoin/libbitcoin-explorer.nix   |  2 +-
 .../misc/libbitcoin/libbitcoin-network.nix    |  2 +-
 .../misc/libbitcoin/libbitcoin-protocol.nix   |  2 +-
 pkgs/tools/misc/libbitcoin/libbitcoin.nix     |  2 +-
 pkgs/tools/misc/massren/default.nix           |  2 +-
 pkgs/tools/misc/mmake/default.nix             |  2 +-
 pkgs/tools/misc/neofetch/default.nix          |  2 +-
 pkgs/tools/misc/pal/default.nix               |  2 +-
 pkgs/tools/misc/papis/default.nix             |  2 +-
 pkgs/tools/misc/peruse/default.nix            |  2 +-
 pkgs/tools/misc/pipelight/default.nix         |  2 +-
 .../misc/profile-sync-daemon/default.nix      |  2 +-
 pkgs/tools/misc/qt5ct/default.nix             |  2 +-
 pkgs/tools/misc/recutils/default.nix          |  2 +-
 pkgs/tools/misc/s6-portable-utils/default.nix |  2 +-
 pkgs/tools/misc/svtplay-dl/default.nix        |  2 +-
 .../misc/system-config-printer/default.nix    |  3 +-
 pkgs/tools/misc/t/default.nix                 |  2 +-
 pkgs/tools/misc/tmuxinator/default.nix        |  2 +-
 pkgs/tools/misc/tmuxp/default.nix             |  2 +-
 pkgs/tools/misc/toilet/default.nix            |  2 +-
 pkgs/tools/misc/trash-cli/default.nix         |  2 +-
 pkgs/tools/misc/upower-notify/default.nix     |  2 +-
 pkgs/tools/misc/urjtag/default.nix            |  2 +-
 pkgs/tools/misc/watchexec/default.nix         |  2 +-
 pkgs/tools/misc/xfstests/default.nix          |  2 +-
 pkgs/tools/misc/xvfb-run/default.nix          |  2 +-
 pkgs/tools/misc/youtube-dl/default.nix        |  2 +-
 .../misc/yubikey-neo-manager/default.nix      |  2 +-
 pkgs/tools/misc/zsh-autoenv/default.nix       |  2 +-
 pkgs/tools/networking/airfield/default.nix    |  2 +-
 pkgs/tools/networking/argus/default.nix       |  2 +-
 pkgs/tools/networking/assh/default.nix        |  2 +-
 pkgs/tools/networking/cmst/default.nix        |  2 +-
 pkgs/tools/networking/connman/default.nix     |  2 +-
 pkgs/tools/networking/dd-agent/default.nix    |  2 +-
 pkgs/tools/networking/dnsmasq/default.nix     |  2 +-
 pkgs/tools/networking/flannel/default.nix     |  2 +-
 pkgs/tools/networking/i2pd/default.nix        |  2 +-
 pkgs/tools/networking/inadyn/default.nix      |  2 +-
 pkgs/tools/networking/ipv6calc/default.nix    |  3 +-
 pkgs/tools/networking/maxscale/default.nix    |  2 +-
 .../networking/network-manager/default.nix    |  2 +-
 .../networking/network-manager/dmenu.nix      |  2 +-
 .../network-manager/fortisslvpn.nix           |  2 +-
 .../network-manager/openvpn/default.nix       |  2 +-
 pkgs/tools/networking/ngrok-1/default.nix     |  2 +-
 pkgs/tools/networking/openssh/default.nix     |  2 +-
 pkgs/tools/networking/s3gof3r/default.nix     |  2 +-
 .../networking/shadowsocks-libev/default.nix  |  2 +-
 pkgs/tools/networking/skydive/default.nix     |  2 +-
 pkgs/tools/networking/srelay/default.nix      |  2 +-
 pkgs/tools/networking/tcpdump/default.nix     |  2 +-
 .../networking/tcptraceroute/default.nix      |  2 +-
 pkgs/tools/networking/tftp-hpa/default.nix    |  2 +-
 pkgs/tools/networking/tinc/pre.nix            |  2 +-
 pkgs/tools/networking/ua/default.nix          |  2 +-
 pkgs/tools/networking/wicd/default.nix        |  3 +-
 pkgs/tools/networking/zap/default.nix         |  2 +-
 .../nix-prefetch-scripts/default.nix          |  2 +-
 .../package-management/nix-repl/default.nix   |  2 +-
 .../package-management/nix-serve/default.nix  |  2 +-
 .../package-management/nixops/generic.nix     |  2 +-
 .../package-management/nixops/nixops-dns.nix  |  1 -
 .../package-management/nixui/default.nix      |  2 +-
 .../package-management/packagekit/qt.nix      |  4 +-
 pkgs/tools/security/afl/default.nix           |  2 +-
 pkgs/tools/security/afl/qemu.nix              |  2 +-
 pkgs/tools/security/cfssl/default.nix         |  2 +-
 pkgs/tools/security/cipherscan/default.nix    |  2 +-
 pkgs/tools/security/clamav/default.nix        |  2 +-
 pkgs/tools/security/diceware/default.nix      |  1 -
 pkgs/tools/security/enpass/default.nix        |  2 +-
 pkgs/tools/security/gnupg/22.nix              |  2 +-
 pkgs/tools/security/gorilla-bin/default.nix   |  2 +-
 pkgs/tools/security/hash-slinger/default.nix  |  2 +-
 pkgs/tools/security/hologram/default.nix      |  2 +-
 pkgs/tools/security/jd-gui/default.nix        |  2 +-
 pkgs/tools/security/john/default.nix          |  2 +-
 pkgs/tools/security/keybase/gui.nix           |  4 +-
 pkgs/tools/security/pass/default.nix          |  2 +-
 pkgs/tools/security/pinentry/mac.nix          |  2 +-
 pkgs/tools/security/qesteidutil/default.nix   |  2 +-
 pkgs/tools/security/saml2aws/default.nix      |  2 +-
 pkgs/tools/security/sops/default.nix          |  2 +-
 pkgs/tools/security/ssdeep/default.nix        |  2 +-
 pkgs/tools/security/theharvester/default.nix  |  2 +-
 pkgs/tools/security/tor/update.nix            |  1 -
 pkgs/tools/security/vulnix/default.nix        |  2 +-
 pkgs/tools/system/bootchart/default.nix       |  2 +-
 pkgs/tools/system/confd/default.nix           |  2 +-
 pkgs/tools/system/consul-template/default.nix |  2 +-
 pkgs/tools/system/ddrescue/default.nix        |  1 -
 pkgs/tools/system/evemu/default.nix           |  2 +-
 pkgs/tools/system/gohai/default.nix           |  2 +-
 pkgs/tools/system/journalwatch/default.nix    |  2 +-
 pkgs/tools/system/osquery/default.nix         |  2 +-
 pkgs/tools/system/pcstat/default.nix          |  2 +-
 pkgs/tools/system/procodile/default.nix       |  2 +-
 pkgs/tools/text/codesearch/default.nix        |  2 +-
 pkgs/tools/text/groff/default.nix             |  2 +-
 pkgs/tools/text/platinum-searcher/default.nix |  2 +-
 pkgs/tools/text/ripgrep/default.nix           |  2 +-
 pkgs/tools/text/sgml/jade/default.nix         |  2 +-
 pkgs/tools/text/shfmt/default.nix             |  2 +-
 pkgs/tools/text/sift/default.nix              |  2 +-
 pkgs/tools/text/wgetpaste/default.nix         |  2 +-
 pkgs/tools/text/zimreader/default.nix         |  2 +-
 pkgs/tools/typesetting/tectonic/default.nix   |  2 +-
 pkgs/tools/typesetting/tex/nix/default.nix    |  2 -
 pkgs/tools/typesetting/tex/texlive/bin.nix    | 12 ++--
 pkgs/tools/typesetting/xmlto/default.nix      |  2 +-
 pkgs/tools/video/flvtool2/default.nix         |  2 +-
 pkgs/tools/video/vnc2flv/default.nix          |  2 +-
 pkgs/tools/virtualization/awless/default.nix  |  2 +-
 .../virtualization/cloud-init/default.nix     |  2 +-
 .../virtualization/distrobuilder/default.nix  |  2 +-
 .../virtualization/euca2ools/default.nix      |  2 +-
 .../google-compute-engine/default.nix         |  1 -
 pkgs/top-level/all-packages.nix               | 56 ++++++-------------
 pkgs/top-level/beam-packages.nix              |  2 +-
 pkgs/top-level/dotnet-packages.nix            |  1 -
 pkgs/top-level/emacs-packages.nix             |  6 +-
 pkgs/top-level/haskell-packages.nix           |  2 +-
 pkgs/top-level/haxe-packages.nix              |  2 +-
 pkgs/top-level/java-packages.nix              |  2 +-
 pkgs/top-level/lua-packages.nix               |  6 +-
 pkgs/top-level/ocaml-packages.nix             |  6 +-
 pkgs/top-level/perl-packages.nix              |  2 +-
 pkgs/top-level/python-packages.nix            |  2 +-
 pkgs/top-level/release-python.nix             |  4 +-
 pkgs/top-level/unix-tools.nix                 |  3 +-
 1540 files changed, 1554 insertions(+), 1878 deletions(-)

diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix
index 73cdd3664ea..d7e4ee233a8 100644
--- a/pkgs/applications/altcoins/clightning.nix
+++ b/pkgs/applications/altcoins/clightning.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchpatch, python3, pkgconfig, which, libtool, autoconf, automake,
-  autogen, git, sqlite, gmp, zlib, fetchFromGitHub }:
+{ stdenv, python3, pkgconfig, which, libtool, autoconf, automake,
+  autogen, sqlite, gmp, zlib, fetchFromGitHub }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 385e9e53522..9f1763087de 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -88,5 +88,5 @@ rec {
   parity = callPackage ./parity { };
   parity-ui = callPackage ./parity-ui { };
 
-  particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; };
+  particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; };
 }
diff --git a/pkgs/applications/altcoins/dero.nix b/pkgs/applications/altcoins/dero.nix
index dff7bc0b0dc..8405ea8f842 100644
--- a/pkgs/applications/altcoins/dero.nix
+++ b/pkgs/applications/altcoins/dero.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
-, libunwind, lmdb, miniupnpc, readline }:
+, lmdb, miniupnpc, readline }:
 
 stdenv.mkDerivation rec {
   name = "dero-${version}";
diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index 33c2e598fca..0452f401334 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -1,7 +1,7 @@
 { stdenv , fetchFromGitHub
 , pkgconfig, autoreconfHook
 , db5, openssl, boost, zlib, miniupnpc
-, glib, protobuf, utillinux, qt4, qrencode
+, protobuf, utillinux, qt4, qrencode
 , withGui }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix
index 0659c4fa258..35fd4bc718c 100644
--- a/pkgs/applications/altcoins/ethsign/default.nix
+++ b/pkgs/applications/altcoins/ethsign/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit, clang }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }:
 
 buildGoPackage rec {
   name = "ethsign-${version}";
diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
index b753e2d48c9..1e9192bc6e4 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }:
+{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   version = "0.8.6-2";
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
index 679312d9a8e..7461e4c376a 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-ethereum-classic-${version}";
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 79c8e0dfde8..73aa4452c0f 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
+{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix
index 1aa598f3254..e7f47d0f220 100644
--- a/pkgs/applications/altcoins/hevm.nix
+++ b/pkgs/applications/altcoins/hevm.nix
@@ -5,12 +5,12 @@
 , lens-aeson, memory, monad-par, mtl, optparse-generic, process
 , QuickCheck, quickcheck-text, readline, rosezipper, scientific
 , stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
-, text-format, time, unordered-containers, vector, vty
+, text-format, unordered-containers, vector, vty
 
 , restless-git
 
 , fetchFromGitHub, lib, makeWrapper
-, ncurses, zlib, bzip2, solc, coreutils
+, zlib, bzip2, solc, coreutils
 , bash
 }:
 
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix
index cb8d01467a2..f809b30189f 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }:
+{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }:
 
 let
   version = "0.10.0";
diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix
index f7349581169..9af37ff0bca 100644
--- a/pkgs/applications/altcoins/namecoin.nix
+++ b/pkgs/applications/altcoins/namecoin.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode
+{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode
 , withGui }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index a14a40e9cc7..76ee914bd3d 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -1,4 +1,4 @@
-{lib, pkgs, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}:
+{lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}:
 
 stdenv.mkDerivation rec {
 
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix
index b22302d0d39..8566e6037d6 100644
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, lib, makeWrapper, nodePackages }:
+{ stdenv, pkgs, fetchurl, makeWrapper, nodePackages }:
 
 let
 
diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix
index a273bf33d10..2fd235ade53 100644
--- a/pkgs/applications/altcoins/parity-ui/env.nix
+++ b/pkgs/applications/altcoins/parity-ui/env.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
 , nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }:
 
 let
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index 5be2bec6c72..331e169cf3f 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -4,14 +4,11 @@
 , db48
 , fetchurl
 , libevent
-, libtool
 , miniupnpc
 , openssl
 , pkgconfig
-, utillinux
 , zeromq
 , zlib
-, withGui
 , unixtools
 }:
 
diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix
index 4a4665291d6..4c3f9fe0760 100644
--- a/pkgs/applications/altcoins/stellar-core.nix
+++ b/pkgs/applications/altcoins/stellar-core.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git
+{ stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git
 , bison, flex, postgresql }:
 
 let
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index e672e6f3bae..04ee72edc36 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3
-, lame, flac, eject, mkcue, glyr
+{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3
+, lame, flac, glyr
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix
index c37963c77f3..737e73421c9 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/applications/audio/airwave/default.nix
@@ -1,5 +1,5 @@
 { stdenv, multiStdenv, cmake, fetchFromGitHub, file, libX11, makeWrapper
-, overrideCC, qt5, requireFile, unzip, wine
+, qt5, requireFile, unzip, wine
 }:
 
 let
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index b0c47972e38..1989fd1400d 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool,
-  libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
+{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2,
+  libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
   expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
   autoconf, automake, libtool
   }:
diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
index a3ac2b097e9..2479360b88e 100644
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base
+{ stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base
 , gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib
 , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index b8044972576..611828753e4 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
 , qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
 , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
-, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
+, qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }:
 
 let
   withIpod = config.clementine.ipod or false;
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 4dced0cfafa..e2fcc3c4626 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
+{ stdenv, fetchurl, intltool, pkgconfig, jansson
 # deadbeef can use either gtk2 or gtk3
 , gtk2Support ? false, gtk2 ? null
 , gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/applications/audio/deadbeef/wrapper.nix
index 5b14302204e..cd45ef5926b 100644
--- a/pkgs/applications/audio/deadbeef/wrapper.nix
+++ b/pkgs/applications/audio/deadbeef/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, deadbeef, makeWrapper, plugins }:
+{ symlinkJoin, deadbeef, makeWrapper, plugins }:
 
 symlinkJoin {
   name = "deadbeef-with-plugins-${deadbeef.version}";
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 5c9211e7f3b..3aa8aa371e6 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2
-, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
+, pkgconfig, premake3, xorg, ladspa-sdk }:
 
 stdenv.mkDerivation rec {
   name = "distrho-ports-unstable-2018-01-01";
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 961ef713569..cfb37e5761a 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , makeWrapper
 , pkgconfig
-, clang
 , llvm
 , emscripten
 , openssl
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index f1bdcd8c524..a61f7dc0a90 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake
+{ stdenv, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake
 , alsaSupport ? true, alsaLib ? null
 , jackSupport ? false, libjack2 ? null
 , portaudioSupport ? false, portaudio ? null }:
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index d111502651e..ed34c3118c6 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchFromGitHub, pkgconfig
-, gcc
 , python3
 , gsettings-desktop-schemas
 , desktop-file-utils
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index e0e620bd05f..6546fd7866e 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
-  gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag,
-  libvorbis, hicolor-icon-theme, gdk_pixbuf }:
+  gnome3, gtk3, gettext, perl, perlXMLParser, flex, libid3tag,
+  libvorbis, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   version = "2.1.5";
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index cacbf428caa..2410106cff0 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }:
+{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }:
 
 stdenv.mkDerivation rec {
   name = "jaaa-${version}";
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index 2cb90081c68..e22bca29bc9 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "lastfmsubmitd";
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index d7cc88905c5..740763889ff 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
+{ stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }:
 stdenv.mkDerivation rec {
   name = "VoiceOfFaust-${version}";
   version = "1.1.4";
diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix
index f077afec8b2..343ec8679fe 100644
--- a/pkgs/applications/audio/mikmod/default.nix
+++ b/pkgs/applications/audio/mikmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libmikmod, ncurses, alsaLib }:
+{ stdenv, fetchurl, libmikmod, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "mikmod-3.2.8";
diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix
index d55e711cf33..b657f69e26e 100644
--- a/pkgs/applications/audio/mopidy/mopify.nix
+++ b/pkgs/applications/audio/mopidy/mopify.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, mopidy }:
+{ stdenv, pythonPackages, mopidy }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Mopify";
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index 8e591487111..e21815574d1 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, libav, curl }:
+{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, libav, curl }:
 
 stdenv.mkDerivation rec {
   name = "pianobar-2016.06.02";
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 26f35f25865..d7e6173da9a 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python2Packages, fetchurl, gettext, chromaprint }:
+{ stdenv, python2Packages, fetchurl, gettext }:
 
 let
   pythonPackages = python2Packages;
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index e96b6f1909a..915d7fcbd98 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
+{ stdenv, fetchFromGitHub, python2Packages, chromaprint }:
 
 python2Packages.buildPythonApplication rec {
   pname = "puddletag";
diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/applications/audio/puredata/wrapper.nix
index 9c0a48db51c..80968e2700b 100644
--- a/pkgs/applications/audio/puredata/wrapper.nix
+++ b/pkgs/applications/audio/puredata/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, puredata, makeWrapper, plugins }:
+{ symlinkJoin, puredata, makeWrapper, plugins }:
 
 let
 puredataFlags = map (x: "-path ${x}/") plugins;
diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix
index 28a69d5a3b7..0ff23102e75 100644
--- a/pkgs/applications/audio/rkrlv2/default.nix
+++ b/pkgs/applications/audio/rkrlv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchFromGitHub,
+{ stdenv, fetchFromGitHub,
 automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile
 }:
 
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index a3d418cd4fe..c5754a199ba 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook
 , python3Packages, gnome3, gtk3, gobjectIntrospection}:
 
 let
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index 2e335e6b10e..134e5bfb42a 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, llvmPackages, pkgconfig, mpd_clientlib, openssl }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, mpd_clientlib, openssl }:
 
 stdenv.mkDerivation rec {
   name = "ympd-${version}";
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index e840c6eeda0..2c76891b3f9 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
+{ stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, gtk2, glib, libXtst }:
 
 stdenv.mkDerivation rec {
   version = "4.8.3";
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 6ba053499f9..8d3d9c9bfcf 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils
+, intltool, libxklavier, libgcrypt, audit, coreutils
 , qt4 ? null
 , withQt5 ? false, qtbase
 }:
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 27b23bb571f..5e583049190 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,5 +1,5 @@
-{ mkDerivation, lib, fetchFromGitHub, fetchpatch
-, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
+{ mkDerivation, lib, fetchFromGitHub
+, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
 }:
 
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index b7a23b589db..bd0c412efa5 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }:
+{ stdenv, callPackage, makeFontsConf, gnome2 }:
 
 let
   mkStudio = opts: callPackage (import ./common.nix opts) {
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 8139640457e..4078efa6783 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
+{ stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}:
 
 let
   common = pname: {version, sha256}: stdenv.mkDerivation rec {
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index f93d4042a62..da78c39324a 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
 , gconf, nss, xorg, libcap, systemd, libnotify, libsecret
 }:
 
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 23cb16c0733..1065564f7b4 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
-, cups, libgcrypt_1_5, systemd, makeWrapper, dbus }:
+{ stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
+, cups, libgcrypt_1_5, systemd, dbus }:
 with stdenv.lib;
 
 let
diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix
index 03c3c5d5eec..33d80a577db 100644
--- a/pkgs/applications/editors/dit/default.nix
+++ b/pkgs/applications/editors/dit/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, stdenv, coreutils, ncurses, lua }:
+{ fetchurl, stdenv, coreutils, ncurses, lua }:
 
 stdenv.mkDerivation rec {
   name = "dit-${version}";
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index a2d246809c9..c719c7b2da1 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
-, freetype, fontconfig, libX11, libXext, libXrender, zlib
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
+, freetype, fontconfig, libX11, libXrender, zlib
 , glib, gtk3, libXtst, jdk, gsettings-desktop-schemas
 , webkitgtk ? null  # for internal web browser
-, buildEnv, writeText, runCommand
+, buildEnv, runCommand
 , callPackage
 }:
 
diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
index 9585f327821..66ac9a3d77e 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
@@ -1,4 +1,4 @@
-{ clangStdenv, fetchgit, llvmPackages, clang }:
+{ clangStdenv, fetchgit, llvmPackages }:
 
 clangStdenv.mkDerivation {
   name = "emacs-clang-complete-async-20130218";
diff --git a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
index f09a71ec9df..ad22faf3dff 100644
--- a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, melpaBuild }:
 
 melpaBuild {
   pname = "filesets-plus";
diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
index 5362451e06b..b4ee54f3bd3 100644
--- a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "font-lock-plus";
diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/pkgs/applications/editors/emacs-modes/header2/default.nix
index 7da40425185..171d8c6b16a 100644
--- a/pkgs/applications/editors/emacs-modes/header2/default.nix
+++ b/pkgs/applications/editors/emacs-modes/header2/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "header2";
diff --git a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
index 3144eea702d..8b9ebcd6026 100644
--- a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "hexrgb";
diff --git a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
index 8e5d5ee1929..84dae10127e 100644
--- a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
+++ b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "lib-requires";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index bf0d5036897..c0febd803cc 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -13,7 +13,7 @@ To update the list of packages from MELPA,
 
 */
 
-{ lib, external }:
+{ external }:
 
 self:
 
diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
index 7ed6355f981..9f8d408dd5a 100644
--- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, emacs, ocaml }:
+{ stdenv, emacs, ocaml }:
 
 # this package installs the emacs-mode which
 # resides in the ocaml compiler sources.
diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix
index 8df45ffb61e..46b90a52a09 100644
--- a/pkgs/applications/editors/emacs-modes/org-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/org-packages.nix
@@ -11,7 +11,7 @@ To update the list of packages from ELPA,
 
 */
 
-{ fetchurl, lib, stdenv, texinfo }:
+{ }:
 
 self:
 
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 1189fd1d6d1..99ecddcb264 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, emacs, texinfo, which, texlive }:
+{ fetchurl, stdenv, emacs, texinfo, texlive }:
 
 stdenv.mkDerivation rec {
   name = "org-8.3.3";
diff --git a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
index d68feaec293..820919b5321 100644
--- a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
+++ b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, melpaBuild }:
+{ fetchurl, lib, melpaBuild }:
 
 melpaBuild {
   pname = "thingatpt-plus";
diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
index b659e060e3b..ee21bbbd9bd 100644
--- a/pkgs/applications/editors/emacs/25.nix
+++ b/pkgs/applications/editors/emacs/25.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
 , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
-, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
+, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
 , withX ? !stdenv.isDarwin
 , withGTK2 ? false, gtk2 ? null
 , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 67afdb24cd4..01eaac7be5d 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
 , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
-, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
+, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
 , withX ? !stdenv.isDarwin
 , withGTK2 ? false, gtk2 ? null
 , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 7715de15398..f357972c449 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip
-, coreutils, gnugrep, which, git, python, unzip, libsecret
+{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip
+, coreutils, gnugrep, which, git, unzip, libsecret
 }:
 
 { name, product, version, src, wmClass, jdk, meta } @ attrs:
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 060d1de5e04..2d7ea931dd2 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
-, coreutils, gnugrep, which, git, python, unzip, p7zip
-, androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses
+{ lib, stdenv, callPackage, fetchurl
+, python
+, jdk, cmake, libxml2, zlib, python3, ncurses
 }:
 
 with stdenv.lib;
@@ -10,7 +10,7 @@ let
 
   # Sorted alphabetically
 
-  buildClion = { name, version, src, license, description, wmClass, update-channel }:
+  buildClion = { name, version, src, license, description, wmClass, ... }:
     lib.overrideDerivation (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "CLion";
@@ -66,7 +66,7 @@ let
       '';
     });
 
-  buildDataGrip = { name, version, src, license, description, wmClass, update-channel }:
+  buildDataGrip = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "DataGrip";
@@ -83,7 +83,7 @@ let
       };
     });
 
-  buildGoland = { name, version, src, license, description, wmClass, update-channel }:
+  buildGoland = { name, version, src, license, description, wmClass, ... }:
     lib.overrideDerivation (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "Goland";
@@ -108,7 +108,7 @@ let
       '';
     });
 
-  buildIdea = { name, version, src, license, description, wmClass, update-channel }:
+  buildIdea = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "IDEA";
@@ -125,7 +125,7 @@ let
       };
     });
 
-  buildPhpStorm = { name, version, src, license, description, wmClass, update-channel }:
+  buildPhpStorm = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "PhpStorm";
@@ -142,7 +142,7 @@ let
       };
     });
 
-  buildPycharm = { name, version, src, license, description, wmClass, update-channel }:
+  buildPycharm = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "PyCharm";
@@ -169,7 +169,7 @@ let
       propagatedUserEnvPkgs = [ python ];
     };
 
-  buildRider = { name, version, src, license, description, wmClass, update-channel }:
+  buildRider = { name, version, src, license, description, wmClass, ... }:
     lib.overrideDerivation (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "Rider";
@@ -195,7 +195,7 @@ let
       '';
     });
 
-  buildRubyMine = { name, version, src, license, description, wmClass, update-channel }:
+  buildRubyMine = { name, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "RubyMine";
@@ -208,7 +208,7 @@ let
       };
     });
 
-  buildWebStorm = { name, version, src, license, description, wmClass, update-channel }:
+  buildWebStorm = { name, version, src, license, description, wmClass, ... }:
     lib.overrideDerivation (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "WebStorm";
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index 6f5f416f4f5..08918beb8d5 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,
+{ stdenv, fetchgit, gnome3, at-spi2-core,
   boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
   libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
   coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 8ef1e549906..83598bd7eb1 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt, pkgconfig }:
+{ stdenv, fetchFromGitHub, ncurses, asciidoc, docbook_xsl, libxslt, pkgconfig }:
 
 with stdenv.lib;
 
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index b03abc2146a..4e22e032e35 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper
+{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
 , # Patchelf dependencies:
   alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined
 , openssl, xorg, zlib
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 66112b3498d..69e102f2077 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, fetchNuGet
+{ stdenv, fetchurl
 , autoconf, automake, pkgconfig, shared-mime-info, intltool
 , glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip
 , dotnetPackages
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index fb0ce43a60e..96a9cea09c7 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, hostPlatform, fetchurl, fetchFromGitHub
+{ stdenv, fetchurl, fetchFromGitHub
 , ncurses
 , texinfo
 , gettext ? null
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index f47688b8280..af454d357e9 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv
-, libtool, libuv, luaPackages, ncurses, perl, pkgconfig
-, unibilium, vimUtils, xsel, gperf, callPackage
+, libuv, luaPackages, ncurses, pkgconfig
+, unibilium, xsel, gperf
 , libvterm-neovim
 , withJemalloc ? true, jemalloc
 }:
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index f1ec03cb42e..fa060325559 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeDesktopItem, makeWrapper
+{ stdenv, lib, makeWrapper
 , vimUtils
 , bundlerEnv, ruby
 , pythonPackages
@@ -10,8 +10,7 @@ neovim:
 
 let
   wrapper = {
-    name ? "neovim"
-    , withPython ? true,  extraPythonPackages ? []
+      withPython ? true,  extraPythonPackages ? []
     , withPython3 ? true,  extraPython3Packages ? []
     , withRuby ? true
     , withPyGUI ? false
diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix
index e806e63cdbf..567f4752035 100644
--- a/pkgs/applications/editors/nvpy/default.nix
+++ b/pkgs/applications/editors/nvpy/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchurl, tk, python2Packages }:
+{ pkgs, fetchurl, python2Packages }:
 
 let
   pythonPackages = python2Packages;
diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix
index e319ccf39b1..dfb2e49e0c8 100644
--- a/pkgs/applications/editors/texmacs/darwin.nix
+++ b/pkgs/applications/editors/texmacs/darwin.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeWrapper,
+{ stdenv, callPackage, fetchurl,
   guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript,
   tex ? null,
   aspell ? null,
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index b23db38e0f4..5f9fa850fe6 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, qmake
-, python, qtbase, qttools, zlib }:
+, python, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "tiled-${version}";
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 082bc2a2536..7777ef1f17c 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango
+{ stdenv, fetchurl, dpkg, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango
 , gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index b6c03a57b56..c97b17bd9af 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ncurses, gettext
-, pkgconfig, cscope, python, ruby, tcl, perl, luajit
+, pkgconfig, python, ruby, tcl, perl, luajit
 , darwin
 }:
 
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index cf58d5d2190..3e815642c17 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem,
+{ stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem,
   gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix
index 9b0d69ae65a..5535d9ab112 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript
+{ stdenv, lib, runCommand, buildEnv, vscode, which, writeScript
 , vscodeExtensions ? [] }:
 
 /*
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index 5597bf0d0b3..c345e8a95d5 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext, bash }:
+{ stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:
 
 stdenv.mkDerivation rec {
   name = "wxHexEditor-${version}";
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 02e874739ef..c2ead5a1914 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
+{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
 , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
 , qjson, qca2, txt2tags, openssl, darwin, pkgconfig
 , withGrass ? true, grass, IOKit, ApplicationServices
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 63cf950f02a..86aafa9697d 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
+{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
 , ApplicationServices
-, buildPlatform, hostPlatform
+, hostPlatform
 }:
 
 let
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index b767f11da00..94a4aeaa933 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -2,7 +2,7 @@
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
 , ApplicationServices
-, buildPlatform, hostPlatform
+, hostPlatform
 }:
 
 let
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 5fb7e007806..53264580380 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig,
+{ stdenv, fetchFromGitHub, pkgconfig, libconfig,
   gtkmm2, glibmm, libxml2, libsecret, curl, libzip,
   librsvg, gst_all_1, autoreconfHook, makeWrapper,
   useUnrar ? false, unrar
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index fbf6443b91f..d427b2586c0 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeDesktopItem, fetchurl, unzip
+{ stdenv, makeDesktopItem, fetchurl, unzip
 , gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2
 , xorg, mozjpeg
 }:
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index f7a813f3606..df742645e86 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }:
+{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }:
 
 
 let
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 5c6a4bab930..a31bbe8caeb 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch
+{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
 
 # For `digitaglinktree`
 , perl, sqlite
@@ -35,7 +35,6 @@
 , libusb1
 , marble
 , libGLU_combined
-, mysql
 , opencv3
 , pcre
 , threadweaver
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index 7667b674fce..69d09cd429c 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ pythonPackages, fetchFromGitHub }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "dosage";
diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix
index 02528a43e31..ef694dec652 100644
--- a/pkgs/applications/graphics/epeg/default.nix
+++ b/pkgs/applications/graphics/epeg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake
+{ stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake
 , libjpeg, libexif
 }:
 
diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix
index 355acf7681a..b1437508a50 100644
--- a/pkgs/applications/graphics/fstl/default.nix
+++ b/pkgs/applications/graphics/fstl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, qtbase, mesa_glu, qmake}:
+{stdenv, fetchFromGitHub, qtbase, mesa_glu}:
 stdenv.mkDerivation rec {
   name = "fstl-${version}";
   version = "0.9.3";
diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index 2d4fa882dd6..b4715902df1 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, barcode, gnome3, autoreconfHook
 , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book
-, intltool, itstool, makeWrapper, pkgconfig, which
+, intltool, itstool, makeWrapper, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 3d49452cbe6..99230eb23e3 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook
+{ stdenv, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook
 , glfw3, gtk3, libpng12 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 2c322128c38..ee58e9831e9 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript
+{ stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 639f1928f8a..a82f13ee409 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
+{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libXft
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 996d495d87c..3555c2b477f 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc
+{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
 , cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
 , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
 , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index 8f043816ba0..0d898df14b3 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook
-, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons
+, kconfig, kinit, kdoctools, kio, kparts, kwidgetsaddons
 , qtbase, qtsvg
 , boost, graphviz
 }:
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 1fd19162a4f..ec92638f855 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules
+{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules
 , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
 , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
 , kio, kcrash
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 1103c9ff40a..50862a4583b 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchFromGitHub
 , cmake
-, makeWrapper
 , pkgconfig
 , wrapGAppsHook
 , gsettings-desktop-schemas
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 9ab5288700c..44855d5c8b4 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5
+{ stdenv, fetchFromGitHub, qt5, libsForQt5
 , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
 , mpfr, gmp, glib, pkgconfig, harfbuzz, gettext
 }:
diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix
index 803257d9392..6916ef4ad7a 100644
--- a/pkgs/applications/graphics/processing3/default.nix
+++ b/pkgs/applications/graphics/processing3/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
+{ stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   version = "3.3.7";
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 2ca1fead84c..0f47c82f032 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv
 , avahi, libjpeg, libusb1, libv4l, net_snmp, libpng
 , gettext, pkgconfig
 
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index 29e53683d1c..d55441e39fa 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeDesktopItem
+{ stdenv, fetchFromGitHub
 , cmake, libjpeg, libpng, libtiff, boost
 , qtbase, qttools }:
 
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index cffe485711f..292ae9c8faa 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages, glib }:
+{ stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 3bc814e1e75..1f41253b699 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
+{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
 , hicolor-icon-theme
 }:
 
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 930a7e686f8..63d35cc5453 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3
-, libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
+{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
+, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
 , imagemagick, intltool, autoreconfHook, which, defaultIconTheme
 }:
 
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
index a1c39fadb59..231a9799b59 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, qtbase, qtsvg,  makeWrapper, fetchurl, makeDesktopItem }:
+{ stdenv, lib, qtbase, qtsvg,  fetchurl, makeDesktopItem }:
 stdenv.mkDerivation rec {
   name = "write_stylus-${version}";
   version = "209";
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index a8b4038b11f..aa2435c43de 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }:
+{ stdenv, requireFile, makeWrapper, unzip, jre }:
 
 stdenv.mkDerivation rec {
   name = "yEd-${version}";
diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix
index 3f3c2a32e68..de9be76b6e4 100644
--- a/pkgs/applications/inferno/default.nix
+++ b/pkgs/applications/inferno/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchhg, stdenv, xorg, makeWrapper }:
+{ fetchhg, stdenv, xorg, makeWrapper }:
 
 stdenv.mkDerivation rec {
   # Inferno is a rolling release from a mercurial repository. For the verison number
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index fb631414838..598857f2e70 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, config, makeWrapper,
+  mkDerivation, lib, makeWrapper,
 
   extra-cmake-modules, kdoctools,
 
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 8f64c884931..d839a7141e3 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -26,8 +26,7 @@ still shows most of the available features is in `./gwenview.nix`.
 */
 
 {
-  stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs,
-  plasma5, attica, phonon,
+  lib, libsForQt5, fetchurl,
   okteta
 }:
 
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 2570e37bf2c..6a4635c26fb 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -1,10 +1,10 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
+  baloo, baloo-widgets, kactivities, kbookmarks, kcmutils,
   kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
   kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
-  konsole, kparts, ktexteditor, kwindowsystem, phonon, solid
+  kparts, ktexteditor, kwindowsystem, phonon, solid
 }:
 
 mkDerivation {
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 65080ba7f06..9da12b248c5 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -2,18 +2,13 @@
 , lib
 , extra-cmake-modules
 , kdoctools
-, kactivities
 , kconfig
 , kcrash
 , kguiaddons
 , kiconthemes
 , ki18n
 , kinit
-, kio
-, kio-extras
-, kwindowsystem
 , kdbusaddons
-, plasma-framework
 , knotifications
 , knewstuff
 , karchive
diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix
index 52aa2b10e24..cae2aec5668 100644
--- a/pkgs/applications/kde/libkomparediff2.nix
+++ b/pkgs/applications/kde/libkomparediff2.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
+{ mkDerivation, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
 
 mkDerivation {
   name = "libkomparediff2";
diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix
index 10123944e3a..d17ffb3c044 100644
--- a/pkgs/applications/kde/pim-data-exporter.nix
+++ b/pkgs/applications/kde/pim-data-exporter.nix
@@ -4,7 +4,7 @@
   akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
   kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
   kwallet, libkdepim, libkleo, pimcommon, qttools,
-  karchive, mailcommon, messagelib, pim-data-exporter
+  karchive, mailcommon, messagelib
 }:
 
 mkDerivation {
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
index 02e9a47274b..bbbcca13d98 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
-  kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin,
+  kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
   kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
   kwallet, kwindowsystem, libkdepim, qtwebengine
 }:
diff --git a/pkgs/applications/misc/acbuild/default.nix b/pkgs/applications/misc/acbuild/default.nix
index 319764ae81a..c1b8a7eb866 100644
--- a/pkgs/applications/misc/acbuild/default.nix
+++ b/pkgs/applications/misc/acbuild/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, fetchFromGitHub }:
+{ stdenv, go, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "acbuild-${version}";
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 698485fb086..09da61f3464 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -9,7 +9,6 @@
   freetype,
   fontconfig,
   libX11,
-  gperf,
   libXcursor,
   libXxf86vm,
   libXi,
diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix
index acd5ae7dd73..fc5fa4d0300 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/pkgs/applications/misc/bashSnippets/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper
-, curl, netcat, python, bind, iproute, bc, gitMinimal }:
+, curl, python, bind, iproute, bc, gitMinimal }:
 let
   version = "1.17.3";
   deps = lib.makeBinPath [
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 1aabbb587eb..8e553af5250 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng
+{ stdenv, fetchurl, poppler_utils, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite
-, makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp
+, makeWrapper, unrarSupport ? false, chmlib, python2Packages, libusb1, libmtp
 , xdg_utils, makeDesktopItem, wrapGAppsHook
 }:
 
diff --git a/pkgs/applications/misc/cataract/default.nix b/pkgs/applications/misc/cataract/default.nix
index 83292a76c5d..3a9f2028922 100644
--- a/pkgs/applications/misc/cataract/default.nix
+++ b/pkgs/applications/misc/cataract/default.nix
@@ -1,13 +1,4 @@
-{ callPackage
-, stdenv
-, fetchgit
-, autoconf
-, automake
-, glib
-, pkgconfig
-, libxml2
-, exiv2
-, imagemagick }:
+{ callPackage }:
 
 callPackage ./build.nix {
   version = "1.1.0";
diff --git a/pkgs/applications/misc/cataract/unstable.nix b/pkgs/applications/misc/cataract/unstable.nix
index 8d8b063e48b..397aed355a9 100644
--- a/pkgs/applications/misc/cataract/unstable.nix
+++ b/pkgs/applications/misc/cataract/unstable.nix
@@ -1,13 +1,4 @@
-{ callPackage
-, stdenv
-, fetchgit
-, autoconf
-, automake
-, glib
-, pkgconfig
-, libxml2
-, exiv2
-, imagemagick }:
+{ callPackage }:
 
 callPackage ./build.nix {
   version = "unstable-2016-10-18";
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 03709c30373..6bd1cef7c1b 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, gettext, sqlite }:
+{ stdenv, fetchurl, pythonPackages, gettext }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 6e0152c71ed..8c57ebead6a 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper
-, python, pyserial, pygtk }:
+, pyserial, pygtk }:
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix
index 7aa19ffb301..fbeb965df38 100644
--- a/pkgs/applications/misc/dbvisualizer/default.nix
+++ b/pkgs/applications/misc/dbvisualizer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, coreutils, makeWrapper }:
+{ stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "dbvisualizer-9.5.7";
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 53344595f78..6cbdc8ece0c 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }:
+{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }:
 
 let
   version = "git-2016-01-10";
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 76b61de5608..891222a0f10 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages, qtbase }:
+{ stdenv, fetchurl, python3Packages }:
 
 let
 
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 383f73b6299..ed2f0626e5d 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, python3Packages, zbar, fetchpatch }:
+{ stdenv, fetchurl, python3, python3Packages, zbar }:
 
 python3Packages.buildPythonApplication rec {
   name = "electrum-${version}";
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 73911bab6f6..3d715a1d16b 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }:
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "evtest-1.33";
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 9ddd39981cc..d8a0c53d9e1 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
+{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
   xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index 93e5d297ffb..2c024b9fe0e 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper
+{ stdenv, fetchFromGitHub, makeWrapper
 , pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk-doc
 , keybinder3, clutter-gtk, libnotify
 , libxkbcommon, xorg, udev
diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix
index f3f7fe2aacb..a3aebf22733 100644
--- a/pkgs/applications/misc/gcal/default.nix
+++ b/pkgs/applications/misc/gcal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, ncurses  }:
+{ stdenv, fetchurl, ncurses  }:
 
 stdenv.mkDerivation rec {
   name = "gcal-${version}";
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index efd3bfe73dd..f62eb92ac04 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
-, yacc, flex, zlib, config, qmake, makeWrapper
+, yacc, flex, zlib, qmake, makeWrapper
 }:
 stdenv.mkDerivation rec {
   name = "golden-cheetah-${version}";
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index c77f8658220..9c1b457c299 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv
-, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
+, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11
 , zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }:
 
 let
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 586807b2dd5..6689a3cae10 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index d87ac459d02..ed0dd3ba5be 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }:
+{ stdenv, fetchFromGitHub, qmake, qttools }:
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 50f575d15ce..b4b98909447 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3,
-  pango, gsettings-desktop-schemas, gobjectIntrospection, wrapGAppsHook,
+  pango, gobjectIntrospection, wrapGAppsHook,
 # Optional packages:
  enableOSM ? true, osm-gps-map
  }:
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index 5fdb8985bbb..6c84f3cbd32 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgs, makeWrapper
+{ stdenv, pkgs, makeWrapper
 , glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler
 , pkgconfig, intltool, autoreconfHook, wrapGAppsHook
 }:
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index 105f7beb98f..2abdce45c95 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils
-, intltool, dbus-glib, gnome_python, dbus
+, intltool, dbus-glib, gnome_python
 , hicolor-icon-theme
 }:
 
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index 624c15e118a..1fa016627d4 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, python }:
 
 with python.pkgs;
 
diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix
index 0b679617243..607dff29318 100644
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/pkgs/applications/misc/houdini/default.nix
@@ -1,4 +1,4 @@
-{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }:
+{ callPackage, buildFHSUserEnv, undaemonize }:
 
 let
   houdini-runtime = callPackage ./runtime.nix { };
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
index 2295e15cc3d..49b1741fd5a 100644
--- a/pkgs/applications/misc/icesl/default.nix
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }:
+{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }:
 let
   lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ];
 in
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index c4f10a1c35b..9872ff23f34 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre10 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre10 }:
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 075640f702c..3c5184d5463 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3 }:
+{ stdenv, fetchurl, glibcLocales, python3 }:
 
 let
   python = python3.override {
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 38c2494c9f7..0c894fb0b61 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, harfbuzz,
-  fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper, xsel,
+{ stdenv, fetchFromGitHub, python3Packages, glfw, libunistring, harfbuzz,
+  fontconfig, pkgconfig, ncurses, imagemagick, xsel,
   libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
   libxkbcommon, libXi, libXext, wayland-protocols, wayland,
   which
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 699cb2fd098..c37d26f3dbc 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig
 , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
-, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
+, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
 , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
 , xapian, ctpp2, zimlib
 }:
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
index bb55fc2d4a8..3072963c43e 100644
--- a/pkgs/applications/misc/kupfer/default.nix
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -1,11 +1,9 @@
 { stdenv
-, makeWrapper
 , fetchurl
 , intltool
 , python3Packages
 , gobjectIntrospection
 , gtk3
-, dbus
 , libwnck3
 , keybinder3
 , hicolor-icon-theme
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 25067e3bba5..372adef4375 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf
-, lablgl, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
+, gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }:
 
 assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
 
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix
index 787ce7231f3..f2dacb7890f 100644
--- a/pkgs/applications/misc/madonctl/default.nix
+++ b/pkgs/applications/misc/madonctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "madonctl-${version}";
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index fb17aadfa49..23f14d7ac9a 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb, autoPatchelfHook }:
+{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, autoPatchelfHook }:
 let
   version = "4.3.89";
 in stdenv.mkDerivation {
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix
index 336b136c56d..8c6bd92d536 100644
--- a/pkgs/applications/misc/mop/default.nix
+++ b/pkgs/applications/misc/mop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "mop-${version}";
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 6b057186eaf..2abbfdea041 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2, fetchurl }:
+{ stdenv, fetchFromGitHub, python2 }:
 
 let
 
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 0a1d26012a8..bd65acf5e5e 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }:
+{ stdenv, fetchFromGitHub, octoprint, pythonPackages }:
 
 let
   buildPlugin = args: pythonPackages.buildPythonApplication (args // {
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index ca06b5fa6df..199fa3e9bfe 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, pkgconfig, fetchurl, buildPythonApplication
+{ lib, pkgconfig, fetchurl, buildPythonApplication
 , autoreconfHook, wrapGAppsHook, gobjectIntrospection
 , intltool, yelp-tools, itstool, libxmlxx3
 , python, pygobject3, gtk3, gnome3, substituteAll
 , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
-, xkbcomp, gsettings-desktop-schemas, liblouis
+, xkbcomp, gsettings-desktop-schemas
 , speechd, brltty, setproctitle, gst_all_1, gst-python
 }:
 
diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix
index 746a319c2e1..9ecf0da5806 100644
--- a/pkgs/applications/misc/perkeep/default.nix
+++ b/pkgs/applications/misc/perkeep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }:
+{ stdenv, go, fetchzip, git, fetchFromGitHub, fetchgit }:
 
 # When perkeep is updated all deps in the let block should be removed
 let
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index 23ab0f8d34a..a548c149665 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
+{ stdenv, fetchFromGitHub, postgresql, openssl } :
 
 stdenv.mkDerivation rec {
   name = "pgmanage-${version}";
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 05ad3e2a906..3ac719d18d2 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,6 +1,6 @@
 { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
 , python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil
-, xcbutilwm, xcbutilxrm, fetchpatch, makeWrapper
+, xcbutilwm, xcbutilxrm, makeWrapper
 
 # optional packages-- override the variables ending in 'Support' to enable or
 # disable modules
diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix
index a400bb04da4..dbda7664bde 100644
--- a/pkgs/applications/misc/pt/default.nix
+++ b/pkgs/applications/misc/pt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "pt-0.7.3";
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 7a4348260fd..bf4559e9117 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, fetchpatch, pkgconfig, libssh2
+{ stdenv, lib, fetchgit, pkgconfig, libssh2
 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
 , qtsvg, qttools, qtquick1, qtcharts
 , qmake
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index dcc8300550f..c6d3d6e1a9d 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool
+{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool
 , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection
 , gtk3, python, pygobject3, hicolor-icon-theme, pyxdg
 
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 7da721e9f37..2d22d87c49a 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
-, cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
+, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
 , bison, flex, librsvg, check
 }:
 
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index 17bbf1583c4..c2384f56faa 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, rofi-unwrapped, makeWrapper, theme ? null, lib }:
+{ stdenv, rofi-unwrapped, makeWrapper, theme ? null }:
 
 if theme == null then rofi-unwrapped else
 stdenv.mkDerivation {
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 3ef5a6c4e34..11a75e4064f 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext
-, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme
-, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
+{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat
+, gsettings-desktop-schemas, gdk_pixbuf, gtk3, hicolor-icon-theme
+, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper
 , pkgconfig, python, pythonPackages, vte
 , wrapGAppsHook}:
 
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index d2027696824..5c16a02ddb8 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgs, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
 with pythonPackages;
 buildPythonApplication rec {
diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
index 98d7e12a8ed..909c267def8 100644
--- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix
+++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, rxvt_unicode, makeWrapper, plugins }:
+{ symlinkJoin, rxvt_unicode, makeWrapper, plugins }:
 
 let
   rxvt_name = builtins.parseDrvName rxvt_unicode.name;
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 513c5facc6b..8049cc2feae 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
 , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome3 }:
 
  stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 11a5baa288d..9f4036c3f96 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
-  boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU,
+  boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU,
   glew, eigen, curl }:
 let
   AlienWxWidgets = perlPackages.buildPerlPackage rec {
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 6fa594dec04..9f20b20f7f3 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -1,6 +1,6 @@
 { pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop-file-utils
 , shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer
-, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2, hicolor-icon-theme, adwaita-icon-theme }:
+, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }:
 
 stdenv.mkDerivation rec {
   name = "spacefm-${version}";
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 6c4b32ca9aa..14285a52e27 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
-, gtk3, gsettings-desktop-schemas, p7zip, sweethome3dApp }:
+{ stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
+, gtk3, gsettings-desktop-schemas, sweethome3dApp }:
 
 let
 
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index 1e51ba22ddc..dac447edd7d 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls, readline }:
+{ stdenv, fetchurl, cmake, readline }:
 
 stdenv.mkDerivation rec {
   name = "tasksh-${version}";
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 1cc03b4cd42..f30c6a63948 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus
-, gsettings-desktop-schemas, libsecret, desktop-file-utils, gettext, gtkd
+, gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd
 , perlPackages, wrapGAppsHook, xdg_utils }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index 9aca45264af..ff3caec2964 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+{ stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
   name = "timewarrior-${version}";
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 297f3d0b599..020aa963541 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }:
+{ stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }:
 
 stdenv.mkDerivation rec {
   name = "twmn-git-2014-09-23";
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index e59a3e98943..b61566af6b2 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "wego-${version}";
diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix
index 27376f4db81..410346bce9a 100644
--- a/pkgs/applications/misc/welle-io/default.nix
+++ b/pkgs/applications/misc/welle-io/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
 , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2
 , faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }:
 let
diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix
index 23be3a5dc4f..fd6be8f5920 100644
--- a/pkgs/applications/misc/wsjtx/default.nix
+++ b/pkgs/applications/misc/wsjtx/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake,
-  docbook_xsl, fftw, fftwFloat, gfortran, libtool, libpulseaudio, qtbase,
+  docbook_xsl, fftw, fftwFloat, gfortran, libtool, qtbase,
   qtmultimedia, qtserialport, texinfo, libusb1 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index 05530af1254..9d68affa7ad 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -1,5 +1,5 @@
 { stdenv, stdenvGcc6, lib
-, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl
+, fetchFromGitHub, cmake, libmicrohttpd, openssl
 , opencl-headers, ocl-icd, hwloc, cudatoolkit
 , devDonationLevel ? "0.0"
 , cudaSupport ? false
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
index cadf5ccb6a4..2c569b7d681 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -1,6 +1,6 @@
 {
 fetchFromGitHub, stdenv, lib,
-autoreconfHook, intltool, pkgconfig, makeWrapper, pkgs,
+makeWrapper, pkgs,
 perl, perlPackages,
 gnome2 }:
 
diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix
index 06fa8d2bd0d..8843c821ffb 100644
--- a/pkgs/applications/misc/yubioath-desktop/default.nix
+++ b/pkgs/applications/misc/yubioath-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl,  python27Packages, swig, gettext, pcsclite, qt48Full, yubikey-personalization }:
+{ stdenv, fetchurl,  python27Packages, pcsclite, yubikey-personalization }:
 
 python27Packages.buildPythonApplication rec {
     namePrefix = "";
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 415995a828d..001d70775d6 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig
 , appstream-glib, desktop-file-utils, python3
-, gtk, girara, ncurses, gettext, libxml2
+, gtk, girara, gettext, libxml2
 , file, sqlite, glib, texlive, libintl, libseccomp
 , gtk-mac-integration, synctexSupport ? true
 }:
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index 86fe453465a..9d86dfe4a44 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,6 +1,5 @@
 { stdenv, lib, meson, ninja, fetchurl, pkgconfig, zathura_core, cairo,
-gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec,
-openjpeg, fetchpatch }:
+gtk-mac-integration, girara, mupdf }:
 
 stdenv.mkDerivation rec {
   version = "0.3.3";
diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix
index 92d173807f9..18876cf355b 100644
--- a/pkgs/applications/misc/zscroll/default.nix
+++ b/pkgs/applications/misc/zscroll/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python3, python3Packages, fetchFromGitHub }:
+{ stdenv, python3, python3Packages, fetchFromGitHub }:
 
 let version = "1.0"; in
 
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 196e2eb79bd..c2471d8a0ea 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -5,7 +5,7 @@
 , libevent, expat, libjpeg, snappy
 , libpng, libcap
 , xdg_utils, yasm, minizip, libwebp
-, libusb1, pciutils, nss, re2, zlib, libvpx
+, libusb1, pciutils, nss, re2, zlib
 
 , python2Packages, perl, pkgconfig
 , nspr, systemd, kerberos
@@ -14,11 +14,10 @@
 , glib, gtk2, gtk3, dbus-glib
 , libXScrnSaver, libXcursor, libXtst, libGLU_combined
 , protobuf, speechd, libXdamage, cups
-, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2
+, ffmpeg, libxslt, libxml2
 
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
-, libexif ? null # only needed for Chromium before version 51
 
 # package customization
 , enableNaCl ? false
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index 9dad2df7fd0..21631ef191c 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
-, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }:
+{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
+, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }:
 
 stdenv.mkDerivation rec {
   name = "falkon-${version}";
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 50eb396d644..336cd255661 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -8,7 +8,7 @@
 , freetype, fontconfig, file, nspr, nss, libnotify
 , yasm, libGLU_combined, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, icu, libpng, jemalloc, glib
+, icu, libpng, jemalloc, glib
 , autoconf213, which, gnused, cargo, rustc, llvmPackages
 , debugBuild ? false
 
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index bdb9dab4f9d..f1d7b216120 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch, python3 }:
+{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }:
 
 let
 
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 2df2043517a..52a2ccb292b 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, makeWrapper
+{ stdenv, patchelf, makeWrapper
 
 # Linked dynamic libraries.
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 9cdd32d2aae..6097c0e95f0 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -1,7 +1,6 @@
 { stdenv, buildPackages
 , fetchurl, pkgconfig, ncurses, gzip
 , sslSupport ? true, openssl ? null
-, buildPlatform, hostPlatform
 , nukeReferences
 }:
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index a320321ea17..a172e0e8d5d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo
+{ stdenv, fetchurl, libGL, xorg, cairo
 , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl
 , dbus-glib, alsaLib, libpulseaudio, systemd, pango
 }:
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
index fb6e85ccdbb..3d4e0fc0022 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, zlib }:
+{ stdenv, fetchurl, dpkg }:
 
 stdenv.mkDerivation {
   name = "TREZOR-bridge-1.0.5";
diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix
index 0a8efb3aace..d1f50627d90 100644
--- a/pkgs/applications/networking/browsers/otter/default.nix
+++ b/pkgs/applications/networking/browsers/otter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub
+{ stdenv, cmake, fetchFromGitHub
 , qtbase, qtmultimedia, qtwebengine
 , version ? "0.9.96"
 , sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p"
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 54abc7dedff..9de7518677d 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, glib, glib-networking, gtk2, libsoup, libX11, perl,
+{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl,
   pkgconfig, webkit, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 7aba25dc339..11264df98f1 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE
 , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
 , alsaLib, dbus, cups, libexif, ffmpeg, systemd
-, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
-, libuuid, xz
+, freetype, fontconfig, libXft, libXrender, libxcb, expat
+, libuuid
 , gstreamer, gst-plugins-base, libxml2
 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome3
 , nss, nspr
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 11aa0ce706d..ab2c24727d7 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchurl
 , dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss
 , pciutils, pkgconfig, python2, xdg_utils
 }:
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index 1656e5a09a6..0c210dcc535 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, pkgconfig
+{ lib, fetchFromGitHub, rustPlatform, pkgconfig
 , libsodium, libarchive, openssl }:
 
 with rustPlatform;
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index ff0f664154a..d6e703f79d0 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "kompose-${version}";
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index a1e17f60810..5f7a2e8e284 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -1,5 +1,5 @@
 
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }:
+{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata }:
 
 buildGoPackage rec {
   name = "kops-${version}";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 6bd7ba3eac2..01bf3467af9 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
-, iptables, coreutils
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
 , components ? [
     "cmd/kubeadm"
     "cmd/kubectl"
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 961c0afc5c5..6e2089f9935 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh
 , unzip, gnutar, jdk, python, wrapPython
-, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
+, setuptools, boto, pythonProtobuf, apr, subversion, gzip
 , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
 , ethtool, coreutils, which, iptables, maven
 , bash, autoreconfHook
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 4c2e1b6f4c0..b674f1f6458 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu
-, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig
+{ stdenv, buildGoPackage, fetchFromGitHub, go-bindata, libvirt, qemu
+, gpgme, makeWrapper, hostPlatform, vmnet, python
 , docker-machine-kvm, docker-machine-kvm2
 , extraDrivers ? []
 }:
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 6b6a2dc8986..6f836d27357 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux
-, iptables, coreutils, kerberos, clang
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync, utillinux
+, coreutils, kerberos, clang
 , components ? [
   "cmd/oc"
   "cmd/openshift"
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index 1510dc575cc..c61896d8921 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl , openssh}:
+{ stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
   version = "3.7.7";
diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
index ad4edec6b4e..fddf13795f3 100644
--- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 #
 # USAGE:
diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix
index 135e5402929..f4ad171c267 100644
--- a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   name = "terraform-provider-nixos-${version}";
   version = "0.0.1";
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index fbcb6c8be40..358a1f23147 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildEnv, buildGoPackage, fetchpatch, fetchFromGitHub, makeWrapper }:
+{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper }:
 
 let
   goPackagePath = "github.com/hashicorp/terraform";
@@ -75,7 +75,7 @@ let
             });
     in withPlugins (_: []);
 
-  plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; };
+  plugins = import ./providers { inherit lib buildGoPackage fetchFromGitHub; };
 in rec {
   terraform_0_8_5 = generic {
     version = "0.8.5";
diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix
index 40117b45855..cf1649f7bb3 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 let
   list = import ./data.nix;
 
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index 749b94f7b7e..d2b1a8eba36 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -1,4 +1,4 @@
-{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, gcc, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }:
+{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libpcap, libtins, libtool, lzma, openssl, pkgconfig, stdenv, tcpdump, wireshark-cli }:
 
 stdenv.mkDerivation rec {
   name = "compactor-${version}";
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix
index 826452016e7..113d6a2e5f4 100644
--- a/pkgs/applications/networking/drive/default.nix
+++ b/pkgs/applications/networking/drive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "drive-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index 9793fd234a1..aa7895ce148 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }:
+{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
index 1477d067464..a034827c4ed 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }:
+{ fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 0b2a97b5378..2ed7fbcee3b 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python,
+{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python,
 enableLibPurple ? false, pidgin ? null }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 003ffbfc7d1..f831ac0847c 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -1,7 +1,7 @@
 { stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool
 , perl, perlXMLParser, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook
 , libsigcxx, gtk, dbus-glib, libnotify, libXext, xextproto, gnome3, boost, libsecret
-, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor-icon-theme
+, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib
 , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index e0aecd2c810..1b257ea61dc 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
+{ stdenv, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
 , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
 , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp
 , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 6b17eb0a897..3c267e612a6 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, bundlerEnv, ruby, pkgconfig
+, bundlerEnv, ruby
 , alsaUtils, libnotify, which, wrapGAppsHook, gtk2
 }:
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
index 914b3480a95..095f838fe98 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, pidgin, makeWrapper, plugins }:
+{ symlinkJoin, pidgin, makeWrapper, plugins }:
 
 let
 extraArgs = map (x: x.wrapArgs or "") plugins;
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix
index 5d463648bd8..e7527bafcc6 100644
--- a/pkgs/applications/networking/instant-messengers/pond/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pond/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3,
-  fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3,
+  fetchgit }:
 
 let
   gui = true; # Might be implemented with nixpkgs config.
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 7fabfa5f772..37d9de8794e 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM
-, libICE, qca2, pkgconfig, callPackage, which, glib
+, libICE, qca2, pkgconfig, which, glib
 , libXScrnSaver, scrnsaverproto
 }:
 
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index c99130f28a3..a6aef5e6a2f 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
+{ stdenv, fetchurl, pkgconfig, makeDesktopItem
 , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
 , openssl, protobuf, qmake
 }:
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 024902a9c48..f858bb38dd1 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -30,7 +30,6 @@
 , openssl
 , perl
 , python3
-, bash
 , libupnp
 , speexdsp
 , fetchFromGitHub
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index dbf17d9cbdb..37ce34f09df 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, writeText, conf ? null }:
+{ lib, stdenv, fetchurl, writeText, conf ? null }:
 
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 32648ee34c9..7f7245152b7 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
 , gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
-, systemd, wget, xorg }:
+, systemd, xorg }:
 
 let
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 9354ae72821..39d664805fa 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,4 +1,4 @@
-{ qt5, stdenv }:
+{ qt5 }:
 
 let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index e139904fee5..5955ecb60bd 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig
 , libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
-, libXrender, fontconfig, libXext, libXft, utillinux, libsodium, libopus }:
+, libXrender, fontconfig, libXext, libXft, libsodium, libopus }:
 
 stdenv.mkDerivation rec {
   name = "utox-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index 9ed954cc7ec..9d5d5c1b80f 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub
+{ stdenv, fetchFromGitHub
   , qt4, qmake4Hook, openssl
   , xproto, libX11, libXScrnSaver, scrnsaverproto
   , xz, zlib
diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 8d7bf677983..add4fa632c9 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
+{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index a672fa73c4f..dcd16c7c5b2 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, fetchpatch, lib
+{ stdenv, fetchurl, lib
 , ncurses, openssl, aspell, gnutls
 , zlib, curl, pkgconfig, libgcrypt
 , cmake, makeWrapper, libobjc, libresolv, libiconv
-, writeScriptBin, symlinkJoin # for withPlugins
+, writeScriptBin # for withPlugins
 , asciidoctor # manpages
 , guileSupport ? true, guile
 , luaSupport ? true, lua5
diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix
index 3b45c2fd445..bb62014c77a 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/alpine/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos
+{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos
 , openldap
 }:
 
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 75f34952394..2b62db069bc 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gettext, gtk3, pythonPackages
 , gdk_pixbuf, libnotify, gst_all_1
-, libgnome-keyring3, networkmanager
+, libgnome-keyring3
 , wrapGAppsHook, gnome3
 # otherwise passwords are stored unencrypted
 , withGnomeKeyring ? true
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 36dc94951d5..0f11d9a6df0 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, makeWrapper, openssl, git }:
+{ stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }:
 
 python2Packages.buildPythonApplication rec {
   name = "mailpile-${version}";
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index 487b2799b98..6e2e8d58c67 100644
--- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix
+++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, writeScript, unzip, jre }:
+{ stdenv, fetchurl, makeWrapper, unzip, jre }:
 
 let
   version = "1.9";
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
index 766aab39ce3..e7e199155d7 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
@@ -1,4 +1,4 @@
-{ dpkg, fetchurl, lib, pkgs, stdenv, config
+{ dpkg, fetchurl, lib, pkgs, stdenv
 , alsaLib
 , atk
 , cairo
@@ -13,7 +13,6 @@
 , gdk_pixbuf
 , glib
 , gnome2
-, libgcrypt
 , libgnome-keyring
 , libnotify
 , makeWrapper
diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix
index 728287f8c75..713f585d283 100644
--- a/pkgs/applications/networking/mailreaders/realpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/realpine/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos
+{stdenv, fetchurl, ncurses, tcl, openssl, pam, kerberos
 , openldap
 }:
 # NOTE: Please check if any changes here are applicable to ../alpine/ as well
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index b7ac621eb6d..06777916b92 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian
-, pkgconfig, which }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "sup-0.22.1";
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 92161164485..85c98742af3 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, nspr, nss, libnotify
 , yasm, libGLU_combined, sqlite, unzip
 , hunspell, libevent, libstartup_notification
-, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc
+, icu, libpng, jemalloc
 , autoconf213, which, m4
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
 , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 916bd36ba54..4a1940ae654 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,6 +1,6 @@
 { spellChecking ? true
 , stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
-, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
+, perl, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
 , makeWrapper, gnupg
 , gnomeSupport ? true, libgnome-keyring3
 }:
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix
index 293c6716483..9ed532acfe1 100644
--- a/pkgs/applications/networking/owamp/default.nix
+++ b/pkgs/applications/networking/owamp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromGitHub
+{stdenv, fetchFromGitHub
 , autoconf, automake, mandoc }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 8cb5f768f95..7b854fce6c5 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
+{ stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
 
 let
   version = "6.6.7-build-529";
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index 53485e95b9a..c66c3ca05a4 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -2,7 +2,7 @@
 , extra-cmake-modules, qtbase, qtscript
 , karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig
 , kdoctools, kross, kcmutils, kwindowsystem
-, libktorrent, boost, taglib, libgcrypt, kplotting
+, libktorrent, taglib, libgcrypt, kplotting
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 950187ed9c6..34b4780633b 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
+{ stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2
 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg
 , qtmultimedia, qtx11extras, qttools }:
 
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 315106ea852..e525c564c50 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -1,8 +1,8 @@
 { stdenv
 , fetchurl
 , dbus
-, expat, zlib, fontconfig
-, libpng, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
+, zlib, fontconfig
+, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
 }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index d8fc1d840d2..d9ddf045921 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook
 , openssl, curl, libevent, inotify-tools, systemd, zlib
 , enableGTK3 ? false, gtk3
 , enableSystemd ? stdenv.isLinux
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index aa42af5ccbd..1169dba188c 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
+{ stdenv, fetchurl, pythonPackages, makeWrapper, libtorrentRasterbar, imagemagick
 , enablePlayer ? true, vlc ? null, qt5 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix
index c331c4f287e..6a89731ff10 100644
--- a/pkgs/applications/networking/pyload/default.nix
+++ b/pkgs/applications/networking/pyload/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey
-, pkgs }:
+{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }:
 
 let
   beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix {
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 19e85a9711d..0f107936be6 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, makeDesktopItem
-, atk, cairo, freetype, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem
+, atk, cairo, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
 , lsb-release }:
 
 let
diff --git a/pkgs/applications/networking/remote/freerdp/legacy.nix b/pkgs/applications/networking/remote/freerdp/legacy.nix
index d3746fa6c7a..9830b846525 100644
--- a/pkgs/applications/networking/remote/freerdp/legacy.nix
+++ b/pkgs/applications/networking/remote/freerdp/legacy.nix
@@ -14,10 +14,9 @@
 , ffmpeg
 , libxkbfile
 #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
-, libXfixes
 , libXinerama
 , libXv
-, pulseaudioSupport ? true, libpulseaudio
+, pulseaudioSupport ? true
 }:
 
 assert printerSupport -> cups != null;
diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix
index 1d1d6f4e1e3..f20bb740615 100644
--- a/pkgs/applications/networking/remote/ssvnc/default.nix
+++ b/pkgs/applications/networking/remote/ssvnc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu
-, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk, perl }:
+, libXaw, libXext, libXpm, openjpeg, openssl, tk, perl }:
 
 stdenv.mkDerivation rec {
   name = "ssvnc-${version}";
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 5365228ae65..e4715cce8e1 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }:
+{ stdenv, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }:
 
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix
index 3061467c82b..a778042c2ea 100644
--- a/pkgs/applications/networking/remote/xrdp/default.nix
+++ b/pkgs/applications/networking/remote/xrdp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
+{ stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
 
 let
   xorgxrdp = stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index ea0a756e76d..a1f1d50e5be 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, writeScript, pkgconfig, cmake, qtbase, qttools
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
 , seafile-shared, ccnet, makeWrapper
 , withShibboleth ? true, qtwebengine }:
 
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index ef1dade4ddd..5232704cd36 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
-, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
+{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
+, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib
 , libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
 , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
 , withQt ? false, qt5 ? null
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
index 251bef91360..5519ba41ac7 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
 , gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
-, systemd, wget, xorg, xprintidle-ng }:
+, systemd, xorg, xprintidle-ng }:
 
 let
 
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix
index b8f388c63eb..26288f9f6e6 100644
--- a/pkgs/applications/networking/sync/backintime/qt4.nix
+++ b/pkgs/applications/networking/sync/backintime/qt4.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, makeWrapper, gettext, pkgconfig, libtool, backintime-common, python3, python3Packages }:
+{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }:
 
 stdenv.mkDerivation rec {
   inherit (backintime-common) version src installFlags;
diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix
index 82dd3a506de..bea6a0780ed 100644
--- a/pkgs/applications/networking/sync/casync/default.nix
+++ b/pkgs/applications/networking/sync/casync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , meson, ninja, pkgconfig, sphinx
 , acl, curl, fuse, libselinux, udev, xz, zstd
 , fuseSupport ? true
diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
index abc1f27e4f6..fc4bc6c0671 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 rec {
   version = "3.1.3";
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index f1e3f6b7301..0b4d580cd20 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, perl, libiconv, zlib, popt
+{ stdenv, fetchurl, perl, libiconv, zlib, popt
 , enableACLs ? true, acl ? null
 , enableCopyDevicesPatch ? false
 }:
@@ -6,7 +6,7 @@
 assert enableACLs -> acl != null;
 
 let
-  base = import ./base.nix { inherit stdenv fetchurl fetchpatch; };
+  base = import ./base.nix { inherit stdenv fetchurl; };
 in
 stdenv.mkDerivation rec {
   name = "rsync-${base.version}";
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index bc2a6eb9c3c..e5c04798aab 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, perl, rsync }:
 
 let
-  base = import ./base.nix { inherit stdenv fetchurl fetchpatch; };
+  base = import ./base.nix { inherit stdenv fetchurl; };
 in
 stdenv.mkDerivation rec {
   name = "rrsync-${base.version}";
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 4b68285c3f1..a799df2d1ed 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, znc }:
+{ stdenv, fetchFromGitHub, znc }:
 
 let
   zncDerivation = a@{
diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix
index fdff39e27f9..0a6268f8452 100644
--- a/pkgs/applications/office/autokey/default.nix
+++ b/pkgs/applications/office/autokey/default.nix
@@ -1,5 +1,5 @@
 { lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobjectIntrospection
-, gtksourceview, gnome3, libappindicator-gtk3, libnotify }:
+, gnome3, libappindicator-gtk3, libnotify }:
 
 python3Packages.buildPythonApplication rec {
   name = "autokey-${version}";
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 80046ecb2cd..a7c6165bdd2 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper,
+  mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
   boost, qtwebkit, qtx11extras, shared-mime-info,
   breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
   kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix
index 92feb6618c9..8946bbab931 100644
--- a/pkgs/applications/office/impressive/default.nix
+++ b/pkgs/applications/office/impressive/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, python2, makeWrapper, lib
-, libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }:
+, SDL, ghostscript, pdftk, dejavu_fonts }:
 
 let
   version = "0.12.0";
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index e3ff0b594b4..43258282ac0 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
-, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
+, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis
@@ -8,7 +8,7 @@
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
-, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito
+, fontsConf, pkgconfig, bluez5, libtool, carlito
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index dbfeb0f2fe8..7a2538e4bcd 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
-, CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
+, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis, carlito
@@ -8,7 +8,7 @@
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
-, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
+, fontsConf, pkgconfig, bluez5, libtool
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
index 31de4db76f1..47d2ecc81ea 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, libredirect, coreutils, pcsclite
+{ stdenv, fetchurl, patchelf, coreutils, pcsclite
 , zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }:
 
 let
diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix
index 3564454a674..20dd27fa287 100644
--- a/pkgs/applications/office/timetrap/default.nix
+++ b/pkgs/applications/office/timetrap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   name = "timetrap-${version}";
diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix
index d1b3cb1b1a1..59c58a3af13 100644
--- a/pkgs/applications/office/trytond/default.nix
+++ b/pkgs/applications/office/trytond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages
+{ stdenv, python2Packages
 , withPostgresql ? true }:
 
 with stdenv.lib;
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index a55a98b1f5e..46faf9ba651 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, fetchurl
 , libX11, glib, xorg, fontconfig, freetype
 , zlib, libpng12, libICE, libXrender, cups }:
 
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 9f7048f3646..26a141dc506 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python2Packages }:
 
 #
 # TODO: Declare configuration options for the following optional dependencies:
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 589625cc18f..e3ceffd34c1 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
-, lua, libGLU_combined, pkgconfig, perl, autoreconfHook, glib, cairo
-, pango, gdk_pixbuf, atk
+, lua, libGLU_combined, pkgconfig, perl, autoreconfHook
 }:
 
 let
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 11160812671..24d6246e90c 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib, fetchFromGitHub
-, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv
+, cmake, freetype, libpng, libGLU_combined, openssl, perl, libiconv
 , qtscript, qtserialport, qttools
 , qtmultimedia, qtlocation, makeWrapper, qtbase
 }:
diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix
index a45e5df2f52..854e91b2fcb 100644
--- a/pkgs/applications/science/biology/diamond/default.nix
+++ b/pkgs/applications/science/biology/diamond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, gcc, zlib }:
+{ stdenv, fetchurl, cmake, zlib }:
 
 stdenv.mkDerivation rec {
   name = "diamond-0.8.36";
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix
index 99d2dfa55dd..1a15dcf6197 100644
--- a/pkgs/applications/science/biology/freebayes/default.nix
+++ b/pkgs/applications/science/biology/freebayes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gcc, zlib, bzip2, lzma }:
+{ stdenv, fetchFromGitHub, zlib, bzip2, lzma }:
 
 stdenv.mkDerivation rec {
   name    = "freebayes-${version}";
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix
index 05cd7992aa9..4b4920a6ca3 100644
--- a/pkgs/applications/science/biology/mosdepth/default.nix
+++ b/pkgs/applications/science/biology/mosdepth/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, nim, htslib, patchelf, pcre}:
+{stdenv, fetchFromGitHub, nim, htslib, pcre}:
 
 let
   hts-nim = fetchFromGitHub {
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix
index efe19a4e2b6..140f7032319 100644
--- a/pkgs/applications/science/biology/raxml/default.nix
+++ b/pkgs/applications/science/biology/raxml/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchFromGitHub
-, zlib
 , pkgs
 , mpi ? false
 }:
diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix
index ab3050955df..394973692dc 100755
--- a/pkgs/applications/science/biology/vcftools/default.nix
+++ b/pkgs/applications/science/biology/vcftools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, htslib, zlib, autoreconfHook, pkgconfig, perl }:
+{ stdenv, fetchFromGitHub, zlib, autoreconfHook, pkgconfig, perl }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix
index 99b7ef79594..236225959f7 100644
--- a/pkgs/applications/science/electronics/adms/default.nix
+++ b/pkgs/applications/science/electronics/adms/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libtool, autoreconfHook, flex, bison, gperf,
+{ stdenv, fetchFromGitHub, autoreconfHook, flex, bison, gperf,
   libxml2, perl, perlPackages, gd }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix
index ba2d5221cc5..64777b5a0ac 100644
--- a/pkgs/applications/science/electronics/bitscope/common.nix
+++ b/pkgs/applications/science/electronics/bitscope/common.nix
@@ -2,14 +2,12 @@
 , buildFHSUserEnv
 , cairo
 , dpkg
-, fetchurl
 , gdk_pixbuf
 , glib
 , gtk2-x11
 , makeWrapper
 , pango
 , stdenv
-, writeTextFile
 , xorg
 }:
 
diff --git a/pkgs/applications/science/electronics/bitscope/packages.nix b/pkgs/applications/science/electronics/bitscope/packages.nix
index dc333f3d3b7..58e01f4f9f4 100644
--- a/pkgs/applications/science/electronics/bitscope/packages.nix
+++ b/pkgs/applications/science/electronics/bitscope/packages.nix
@@ -1,8 +1,5 @@
-{ buildFHSUserEnv
-, callPackage
+{ callPackage
 , fetchurl
-, makeWrapper
-, stdenv
 }:
 
 let
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 8e98bad55c3..e3244ec339e 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchbzr, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }:
+{ stdenv, fetchurl, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }:
 
 stdenv.mkDerivation rec {
   name = "kicad-${version}";
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 48afb5bf9dc..33eb52c18ee 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, libGLU_combined, openssl, zlib }:
+{ stdenv, fetchFromGitHub, qtbase, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "librepcb-${version}";
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index 5e1a448a7cf..d7a5e7b4c83 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, zlib, boost, glucose }:
+{ stdenv, fetchurl, fetchFromGitHub, zlib, boost }:
 
 let
   glucose' = fetchurl {
diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix
index 9687ac66ead..a987bf1ba57 100644
--- a/pkgs/applications/science/logic/coq2html/default.nix
+++ b/pkgs/applications/science/logic/coq2html/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, make, fetchgit, ocaml }:
+{ stdenv, make, fetchgit, ocaml }:
 
 let 
   version = "20170720";
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index ff737de0cc4..2b7cb9c30fa 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
+{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   name = "elan-${version}";
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 8d7c11ee91b..a1779baf5f8 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, writeScript, ocaml, camlp5 }:
+{ stdenv, fetchFromGitHub, fetchpatch, ocaml, camlp5 }:
 
 let
   start_script = ''
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix
index 2b861b6d06d..4e1415d3961 100644
--- a/pkgs/applications/science/logic/lean2/default.nix
+++ b/pkgs/applications/science/logic/lean2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, boost, python
+{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, python
 , gperftools, ninja, makeWrapper }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index 6d9549b526f..dc32e84279a 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -1,5 +1,4 @@
-{stdenv, fetchurl, cmake, subversion, libGLU_combined, qt5, boost,
- python27, python27Packages}:
+{stdenv, fetchurl, cmake, libGLU_combined, qt5, boost}:
 
 stdenv.mkDerivation rec {
   version = "201707";
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 949b34420b7..65d2b4d91c3 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp4, ncurses, zlib, makeWrapper, clang_35 }:
+{ stdenv, fetchurl, gmp4, ncurses, zlib, clang_35 }:
 
 let
   libPath = stdenv.lib.makeLibraryPath
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index fb37554b65f..4efc384ed22 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -1,4 +1,4 @@
-{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib
+{ haskellPackages, mkDerivation, fetchFromGitHub, lib
 # the following are non-haskell dependencies
 , makeWrapper, which, maude, graphviz, sapic
 }:
diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix
index 9a78c1df8b1..7d35f5f91df 100644
--- a/pkgs/applications/science/logic/tlaplus/tlaps.nix
+++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix
@@ -1,8 +1,6 @@
-{ lib
-, fetchurl
-, makeWrapper
+{ fetchurl
 , stdenv
-, ocaml, gawk, isabelle, cvc3, perl, wget, which
+, ocaml, isabelle, cvc3, perl, wget, which
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index b677927a8ef..313fe5a9f1d 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, jre, makeWrapper }:
+{ stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "workcraft-${version}";
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index 85a4aa02e44..9c4f2402143 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -1,6 +1,6 @@
-{ luarocks, lib , stdenv,  writeText , readline,  makeWrapper,
-  less, ncurses, cmake, openblas, coreutils, fetchgit, libuuid, czmq, openssl,
-  gnuplot, fetchurl, lua, src, libjpeg, libpng
+{ luarocks, lib , stdenv,  readline,  makeWrapper,
+  less, ncurses, cmake, coreutils, fetchgit, libuuid, czmq, openssl,
+  gnuplot, lua, src, libjpeg, libpng
 } :
 
 let
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 25ebee96a10..913fac6ac12 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
 , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
 , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
-, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch
+, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
 , withRecommendedPackages ? true
 , enableStrictBarrier ? false
 }:
diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix
index 07740f4c8ae..fe5c77be8b2 100644
--- a/pkgs/applications/science/math/cntk/default.nix
+++ b/pkgs/applications/science/math/cntk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, fetchFromGitHub, fetchpatch, cmake
+{ lib, stdenv, fetchgit, fetchFromGitHub, cmake
 , openblas, opencv3, libzip, boost, protobuf, openmpi
 , onebitSGDSupport ? false
 , cudaSupport ? false, cudatoolkit, nvidia_x11
diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix
index 29785363b04..e62df7f11cc 100644
--- a/pkgs/applications/science/math/colpack/default.nix
+++ b/pkgs/applications/science/math/colpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, gettext }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext }:
 
 stdenv.mkDerivation rec {
 
diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix
index 6a49976c86b..4884ee1f93a 100644
--- a/pkgs/applications/science/math/mathematica/10.nix
+++ b/pkgs/applications/science/math/mathematica/10.nix
@@ -7,13 +7,11 @@
 , freetype
 , gcc
 , glib
-, libpng
 , ncurses
 , opencv
 , openssl
 , unixODBC
 , xorg
-, zlib
 , libxml2
 , libuuid
 }:
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
index c4fd0c384c1..d60feb54695 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -7,13 +7,11 @@
 , freetype
 , gcc
 , glib
-, libpng
 , ncurses
 , opencv
 , openssl
 , unixODBC
 , xorg
-, zlib
 }:
 
 let
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index d2a518e9db0..fa4ff8b0068 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -8,7 +8,6 @@
 , freetype
 , gcc
 , glib
-, libpng
 , ncurses
 , opencv
 , openssl
diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix
index 2ed079ab32b..288ffd6e0e1 100644
--- a/pkgs/applications/science/math/sage/env-locations.nix
+++ b/pkgs/applications/science/math/sage/env-locations.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, writeTextFile
+{ writeTextFile
 , pari_data
 , pari
 , singular
diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix
index ba46850bbc6..f4669a6557e 100644
--- a/pkgs/applications/science/math/sage/openblas-pc.nix
+++ b/pkgs/applications/science/math/sage/openblas-pc.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, openblasCompat
+{ openblasCompat
 , writeTextFile
 , name
 }:
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index 3d1ebe87c6b..63b9772b823 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -3,8 +3,6 @@
 , makeWrapper
 , sage-env
 , sage-src
-, sagelib
-, sagedoc
 , openblasCompat
 , openblas-blas-pc
 , openblas-cblas-pc
@@ -14,7 +12,6 @@
 , singular
 , libgap
 , gap-libgap-compatible
-, gcc
 , giac
 , maxima-ecl
 , pari
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix
index 7b280e9e028..a594428a389 100644
--- a/pkgs/applications/science/math/sage/sagedoc.nix
+++ b/pkgs/applications/science/math/sage/sagedoc.nix
@@ -1,7 +1,5 @@
-{ pkgs
-, stdenv
+{ stdenv
 , sage-src
-, env-locations
 , sage-with-env
 , sagelib
 , python2
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index a053d997bf9..abcefba5e26 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, sage-src
+{ sage-src
 , perl
 , buildPythonPackage
 , arb
diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix
index fcdbb6b985d..6063a45a3ef 100644
--- a/pkgs/applications/science/math/scilab/default.nix
+++ b/pkgs/applications/science/math/scilab/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, lib, gfortran
 , ncurses
-, Xaw3d, withXaw3d ? false
+, withXaw3d ? false
 #, withPVMlib ? false
 , tcl, tk, withTk ? false
 , gtk2, withGtk ? false # working ?
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index cec1a831c91..8be302f41e5 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig
+{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig
 , autoreconfHook
 , file
 , flint
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index 3a0bcb66813..b81f188a91b 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, callPackage, jdk, maven, javaPackages }:
+{ stdenv, fetchFromGitHub, jdk, maven, javaPackages }:
 
 let
   version = "0.9.2";
diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix
index f423adbe786..dc768725d4f 100644
--- a/pkgs/applications/science/misc/golly/beta.nix
+++ b/pkgs/applications/science/misc/golly/beta.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchgit
+{stdenv, fetchgit
 , wxGTK, perl, python2, zlib, libGLU_combined, libX11
 , automake, autoconf
 }:
diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix
index 0f0c6aaf74d..c3e1cd60bf0 100644
--- a/pkgs/applications/science/misc/openmvg/default.nix
+++ b/pkgs/applications/science/misc/openmvg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, pkgconfig, cmake
+{ stdenv, fetchgit, pkgconfig, cmake
 , libjpeg ? null
 , zlib ? null
 , libpng ? null
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index 4e5b986a428..b665d5f4f68 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake
+{ stdenv, fetchFromGitHub, pkgconfig, cmake
 , eigen, opencv, ceres-solver, cgal, boost, vcg
 , gmp, mpfr, glog, google-gflags, libjpeg_turbo }:
 
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 00ca1d2c7ab..e966e798ae6 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
+{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2
 , libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash
 , Cocoa, OpenGL, noSplash ? false }:
 
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index babd87eb2b1..98ccd92c4ee 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage
   , boost-build, boost_process
   , xorg_sys_opengl, tbb, ogre, tinyxml-2
-  , libtar, glxinfo,  libusb, libxslt, ruby, ignition
+  , libtar, glxinfo,  libusb, libxslt, ignition
   , pythonPackages, utillinux
 
   # these deps are hidden; cmake doesn't catch them
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 95462c02eb5..ce3317da9f8 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchgit, git,  espeak, SDL2, udev, doxygen, cmake
+{ stdenv, fetchgit, git,  SDL2, udev, doxygen
 , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
 , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech
-, makeWrapper, lndir
-, gst_all_1, qt-gstreamer1, pkgconfig, glibc
+, makeWrapper
+, gst_all_1, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 98576cfd091..507481cddab 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, ace
+{ stdenv, fetchFromGitHub, cmake, ace
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 4411d78cec2..0564f3de1b7 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchPypi, unzip, buildPythonApplication, makeDesktopItem
+{ stdenv, fetchPypi, buildPythonApplication, makeDesktopItem
 # mandatory
 , numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil
-, pyflakes, rope, sphinx, nbconvert, mccabe, pyopengl, cloudpickle
+, pyflakes, rope, nbconvert, mccabe, pyopengl, cloudpickle
 # optional
 , numpy ? null, scipy ? null, matplotlib ? null
 # optional
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index d6c65548c1f..0ad3c6079ac 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, python2Packages, bazaar }:
+{ stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   name = "bzr-tools-${version}";
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix
index 06cfc90e65f..26397380d57 100644
--- a/pkgs/applications/version-management/bitkeeper/default.nix
+++ b/pkgs/applications/version-management/bitkeeper/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl, gperf, bison, groff
-, pkgconfig, libXft, fontconfig, pcre
-, libtomcrypt, libtommath, lz4, zlib }:
+, pkgconfig, libXft, pcre
+, libtomcrypt, libtommath, lz4 }:
 
 stdenv.mkDerivation rec {
   name = "bitkeeper-${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index 474faa30467..88d1f07ee74 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchgit, mercurial, coreutils, git, makeWrapper, subversion}:
+{stdenv, fetchgit, mercurial, makeWrapper, subversion}:
 
 with stdenv.lib;
 stdenv.mkDerivation {
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
index 9f1d8e9d717..4d0f33730e4 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "git-annex-remote-b2-${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 391ca26de25..9bccbdb5049 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:
+{ stdenv, fetchFromGitHub, pythonPackages, gettext, git }:
 
 let
   inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 654576a29e8..9c362276383 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchFromGitHub
 , openssl
-, gcc
 , zlib
 , libssh
 , cmake
diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
index 8b77efd1be2..9ca7a67a53e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-fame/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bundlerEnv, ruby, fetchFromGitHub, makeWrapper, bundler }:
+{ stdenv, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   inherit ruby;
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 94143e652f9..ba126bb476c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, docutils, gitMinimal, python2Packages }:
+{ stdenv, fetchFromGitHub, gitMinimal, python2Packages }:
 
 stdenv.mkDerivation rec {
   name = "git-hub-${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 645b12220bd..12b7b8965ef 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, go, ronn, ruby, groff, Security, utillinux }:
+{ stdenv, buildGoPackage, fetchFromGitHub, ronn, ruby, groff, Security, utillinux }:
 
 buildGoPackage rec {
   name = "hub-${version}";
diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index e3ceccdcf3b..17fb74945dc 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }:
 
 let
   version = "1.0.12";
diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix
index 24c22d423d5..3cde046a2ad 100644
--- a/pkgs/applications/version-management/git-lfs/1.nix
+++ b/pkgs/applications/version-management/git-lfs/1.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index 21ceccf9f35..7b81c28c375 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, python} :
+{ stdenv, fetchurl, pythonPackages} :
 
 pythonPackages.buildPythonApplication rec {
   name = "git-review-${version}";
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
index a0d7382de34..9c5ab20d364 100644
--- a/pkgs/applications/version-management/git-sizer/default.nix
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "git-sizer";
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 917deac6daa..5f8619b4a7f 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
-, git, coreutils, bash, gzip, openssh
+, git, bash, gzip, openssh
 , sqliteSupport ? true
 }:
 
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index db2fdf0199e..3fb9b9492af 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
+{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
 , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
 , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
 , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 87e4aff28c3..71c62b75868 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv
+{ stdenv, lib, fetchurl, fetchFromGitHub, bundlerEnv
 , ruby, tzdata, git, procps, nettools
 }:
 
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 508c8b3fb6d..d3c248b4475 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
-, git, coreutils, bash, gzip, openssh
+, git, bash, gzip, openssh
 , sqliteSupport ? true
 }:
 
diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index ded0d5e3986..88074a0862c 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }:
+{ stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }:
 
 let version = "1.0-mtn-head"; in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index a00393abf27..d786e939675 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python2Packages, makeWrapper, docutils, unzip
+{ stdenv, fetchurl, python2Packages, makeWrapper, unzip
 , guiSupport ? false, tk ? null
-, ApplicationServices, cf-private }:
+, ApplicationServices }:
 
 let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index 7b3c7aafa44..e799d5fac43 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }:
+{ stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }:
 
 stdenv.mkDerivation rec {
   name = "rapidsvn-${version}";
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index 1535d88026a..5a23c38a886 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ruby, bundler, libiconv, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }:
+{ stdenv, fetchurl, ruby, bundler, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }:
 
 let
   gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix);
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix
index 84b6633b883..3fd66572315 100644
--- a/pkgs/applications/version-management/reposurgeon/default.nix
+++ b/pkgs/applications/version-management/reposurgeon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, python27Packages, git
 , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto
 , bazaar ? null, cvs ? null, darcs ? null, fossil ? null
-, mercurial ? null, monotone ? null, rcs ? null, src ? null
+, mercurial ? null, monotone ? null, rcs ? null
 , subversion ? null, cvs_fast_export ? null }:
 
 with stdenv; with lib;
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index a34afbab55e..519f339a508 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -2,7 +2,6 @@
 , jre
 , gtk2, glib
 , libXtst
-, git, mercurial, subversion
 , which
 }:
 
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index dc202e9e7b4..c68cc928848 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   name = "tailor-${version}";
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 8b2d6fcc8c3..0553b60fde7 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub }:
 
 let version = "1.12.0"; in
 stdenv.mkDerivation {
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index b36147009a6..0637e813b48 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir
+{ stdenv, lib, fetchurl, cmake, pkgconfig
 , zlib, gettext, libvdpau, libva, libXv, sqlite
 , yasm, freetype, fontconfig, fribidi
 , makeWrapper, libXext, libGLU, qttools, qtbase
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 4adbdbdadb2..4235ebb802e 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, sourceFromHead, autoconf, automake, libtool
+{ stdenv, fetchgit, autoconf, automake, libtool
 , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
 , libtiff, freetype, mjpegtools, x264, gettext, openexr
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 157e4903e52..48c5032f2da 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
+{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
 , gtk3, gettext, wrapGAppsHook, gdk_pixbuf }:
 
 let
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 0d0ac0a2e94..32dd3e6ff75 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -4,13 +4,13 @@
 #
 
 { stdenv, lib, fetchurl,
-  python2, pkgconfig, yasm, harfbuzz, zlib,
+  python2, pkgconfig, yasm, zlib,
   autoconf, automake, libtool, m4, jansson,
   libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
   libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
   lame, libdvdread, libdvdnav, libbluray,
   mp4v2, mpeg2dec, x264, x265, libmkv,
-  fontconfig, freetype, hicolor-icon-theme,
+  fontconfig, freetype,
   glib, gtk3, intltool, libnotify,
   gst_all_1, dbus-glib, udev, libgudev, libvpx,
   useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null,
diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index 48c7624cfa6..1e8883eae7f 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, cmake, automoc4
+, cmake
 , dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools
 , phonon, qtx11extras
 , extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid
diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix
index 734229eac93..eff9b787106 100644
--- a/pkgs/applications/video/kodi/commons.nix
+++ b/pkgs/applications/video/kodi/commons.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib
-, unzip, cmake, kodiPlain, steam, libcec_platform, tinyxml
-, libusb, pcre-cpp, jsoncpp, libhdhomerun }:
+{ stdenv, fetchFromGitHub
+, cmake, kodiPlain, libcec_platform, tinyxml }:
 
 rec {
 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 776d2732327..5ca678a2e17 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, autoconf, automake, libtool, makeWrapper
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
 , pkgconfig, cmake, gnumake, yasm, python2
 , libgcrypt, libgpgerror, libunistring
 , boost, avahi, lame, autoreconfHook
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 4d6b1885454..5a0583202e6 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, callPackage, fetchurl, fetchFromGitHub, unzip
+{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
 , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
 
 with (callPackage ./commons.nix {});
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index e3b94b69179..64a967001b5 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv
-, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
+{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
+, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
 , nvidia_cg_toolkit, zlib, openssl, portaudio
 }:
 let
diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
index 6569caad6c5..c44bd25b91a 100644
--- a/pkgs/applications/video/mapmap/default.nix
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -1,7 +1,6 @@
 { stdenv 
 , fetchFromGitHub
 , qttools
-, qtbase
 , qtmultimedia
 , liblo
 , gst_all_1
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index f2d40c2ac80..02a0c2c0ec4 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm, ffmpeg
+{ stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg
 , aalibSupport ? true, aalib ? null
 , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
 , fribidiSupport ? true, fribidi ? null
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index cefd5b66aed..e3954598cbe 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper
+{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
 , docutils, perl, pkgconfig, python3, which, ffmpeg_4
 , freefont_ttf, freetype, libass, libpthreadstubs
 , lua, luasocket, libuchardet, libiconv ? null, darwin
diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix
index 1eb725d10bb..090b4ec9ffe 100644
--- a/pkgs/applications/video/natron/default.nix
+++ b/pkgs/applications/video/natron/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages,
   cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
-  poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio,
+  poppler, imagemagick, openexr, ffmpeg, opencolorio, openimageio,
   qmake4Hook, libpng, libGL, lndir }:
 
 let
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 9e5e278ba89..422b50a8585 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , pkgconfig, cmake, doxygen
 , libopenshot-audio, imagemagick, ffmpeg
 , swig, python3
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 6c92b9aeed6..cea85f553b5 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook
-, python3Packages, gst, gtk3, hicolor-icon-theme
+, python3Packages, gst, gtk3
 , gobjectIntrospection, librsvg, gnome3, libnotify
 , meson, ninja
 }:
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index a689697e0a0..1fce30edbdf 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt5, ffmpeg, guvcview, automoc4
+{ stdenv, fetchurl, qt5, ffmpeg, guvcview
 , cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils
 , libv4l, pcre }:
 
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
index 2beb3ca94f2..984b623cee7 100644
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ b/pkgs/applications/video/recordmydesktop/gtk.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig, glib
+{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig
 , pythonPackages, jack2, xwininfo }:
 
 let
diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix
index d85e4df7434..a875daf065e 100644
--- a/pkgs/applications/video/zdfmediathk/default.nix
+++ b/pkgs/applications/video/zdfmediathk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, jre }:
+{ stdenv, fetchurl, jre }:
 
 with stdenv;
 
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 46d03ad3d62..6c739b32c5f 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, removeReferencesTo
-, go, libapparmor, apparmor-parser, libseccomp, btrfs-progs }:
+, go, btrfs-progs }:
 
 with lib;
 
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 6e40f9ba076..d52b5365b5e 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
-, sqlite, iproute, bridge-utils, lvm2, systemd
+, sqlite, iproute, lvm2, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
 , procps, libseccomp
 }:
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index b0fd42f4efb..7172b172ef2 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, go-md2man
 , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }:
 
 with lib;
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index f0ee4b5b26e..8222fb50a8f 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, intltool, libxml2Python, curl }:
+{ stdenv, fetchurl, python2Packages, intltool, libxml2Python }:
 
 with stdenv.lib;
 
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index e7ab3aa251c..f9770435aaf 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
 , libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
-, zlib, libpng, glib, lvm2, libXrandr, libXinerama
+, libpng, glib, lvm2, libXrandr, libXinerama
 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
-, alsaLib, curl, libvpx, gawk, nettools, dbus
+, alsaLib, curl, libvpx, nettools, dbus
 , xorriso, makeself, perl
 , javaBindings ? false, jdk ? null
 , pythonBindings ? false, python2 ? null
-, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null
+, enableExtensionPack ? false, requireFile ? null, fakeroot ? null
 , pulseSupport ? false, libpulseaudio ? null
 , enableHardening ? false
 , headless ? false
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix
index af344eb82cf..65435e19366 100644
--- a/pkgs/applications/virtualization/vpcs/default.nix
+++ b/pkgs/applications/virtualization/vpcs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, glibc, buildPlatform }:
+{ stdenv, fetchurl, glibc, buildPlatform }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 0538228d4b4..dc57ad13d41 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, libxcb, libXinerama
-, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm
+, xcbutil, xcbutilkeysyms, xcbutilwm
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix
index 7b31c63128a..09c7c8e0e08 100644
--- a/pkgs/applications/window-managers/bspwm/unstable.nix
+++ b/pkgs/applications/window-managers/bspwm/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
+{ stdenv, fetchFromGitHub, libxcb, libXinerama, xcbutil, xcbutilkeysyms, xcbutilwm }:
 
 stdenv.mkDerivation rec {
   name = "bspwm-unstable-2016-09-30";
diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix
index 97e399a133e..cc00f1e4b6e 100644
--- a/pkgs/applications/window-managers/clfswm/default.nix
+++ b/pkgs/applications/window-managers/clfswm/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
-, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
-, extraModulePaths ? [] }:
+{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
+, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "clfswm";
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 986639c947b..74c3c71dbf7 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
 , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
-, yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
+, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
 , xorgserver, xvfb_run }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix
index ebe58e921dd..eaeb9979c10 100644
--- a/pkgs/applications/window-managers/notion/default.nix
+++ b/pkgs/applications/window-managers/notion/default.nix
@@ -1,6 +1,6 @@
 {
   enableXft ? true, libXft ? null, patches ? [], stdenv, lua, gettext, pkgconfig, xlibsWrapper, libXinerama, libXrandr, libX11,
-  xterm, xmessage, makeWrapper, lib, fetchFromGitHub, mandoc, which
+  xterm, xmessage, makeWrapper, fetchFromGitHub, mandoc, which
 }:
 
 assert enableXft -> libXft != null;
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix
index 1a3c976f77d..81901be0e60 100644
--- a/pkgs/applications/window-managers/spectrwm/default.nix
+++ b/pkgs/applications/window-managers/spectrwm/default.nix
@@ -1,5 +1,4 @@
 { fetchurl
-, coreutils
 , libX11
 , libXrandr
 , libXcursor
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index 117d4fe1d6a..3ed7f4325f2 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
+{ stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
 , makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
 , extraModulePaths ? []
 , version }:
diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix
index b1e0628ba92..dfb2eec5dc5 100644
--- a/pkgs/applications/window-managers/taffybar/default.nix
+++ b/pkgs/applications/window-managers/taffybar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ghcWithPackages, xmessage, makeWrapper, packages ? (x: []) }:
+{ stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }:
 
 let
 taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index c68562d82b3..8a680e1f763 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, pkgconfig }:
+{ stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
   name = "wtftw-0.0pre20170921";
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 219530a67bd..c733556de45 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, runCommand, lib, writeScript, stdenv, coreutils }:
+{ callPackage, runCommand, writeScript, stdenv, coreutils }:
 
 let buildFHSEnv = callPackage ./env.nix { }; in
 
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index ff45cf81d7e..950c0c86a6e 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1,5 +1,4 @@
 {
-  callPackage,
   coreutils,
   docker,
   e2fsprogs,
diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix
index 79a26abcb83..e6f6c23e449 100644
--- a/pkgs/build-support/emacs/elpa.nix
+++ b/pkgs/build-support/emacs/elpa.nix
@@ -1,6 +1,6 @@
 # builder for Emacs packages built for packages.el
 
-{ lib, stdenv, fetchurl, emacs, texinfo }:
+{ lib, stdenv, emacs, texinfo }:
 
 with lib;
 
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index f55c91f82c7..5fa45b154a3 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -1,7 +1,7 @@
 # builder for Emacs packages built for packages.el
 # using MELPA package-build.el
 
-{ lib, stdenv, fetchurl, fetchFromGitHub, emacs, texinfo }:
+{ lib, stdenv, fetchFromGitHub, emacs, texinfo }:
 
 with lib;
 
diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix
index 3b965b06662..02777c9900d 100644
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/pkgs/build-support/fetchdarcs/default.nix
@@ -1,4 +1,4 @@
-{stdenvNoCC, darcs, nix, cacert}:
+{stdenvNoCC, darcs, cacert}:
 
 {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}:
 
diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix
index c01288dbf53..001693501cc 100644
--- a/pkgs/build-support/fetchdocker/credentials.nix
+++ b/pkgs/build-support/fetchdocker/credentials.nix
@@ -32,7 +32,7 @@
 let
   pathParts =
    (builtins.filter
-    ({path, prefix}: "DOCKER_CREDENTIALS" == prefix)
+    ({prefix}: "DOCKER_CREDENTIALS" == prefix)
     builtins.nixPath);
 in
   if (pathParts != []) then (builtins.head pathParts).path else ""
diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix
index ae3ae4185e0..3556df32d92 100644
--- a/pkgs/build-support/fetchdocker/default.nix
+++ b/pkgs/build-support/fetchdocker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, coreutils, bash, gnutar, jq, writeText }:
+{ stdenv, lib, coreutils, bash, gnutar, writeText }:
 let
   stripScheme =
     builtins.replaceStrings [ "https://" "http://" ] [ "" "" ];
diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix
index 4dcf6d06718..59376f3b042 100644
--- a/pkgs/build-support/fetchgit/private.nix
+++ b/pkgs/build-support/fetchgit/private.nix
@@ -1,4 +1,4 @@
-{ fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
+{ fetchgit, runCommand, makeWrapper, openssh }: args: derivation ((fetchgit args).drvAttrs // {
   SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success
     then builtins.toString <ssh-auth-sock>
     else null;
diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix
index 7a25966e9fb..fa194577553 100644
--- a/pkgs/build-support/fetchgitlocal/default.nix
+++ b/pkgs/build-support/fetchgitlocal/default.nix
@@ -1,4 +1,4 @@
-{ runCommand, git, nix }: src:
+{ runCommand, git }: src:
 
 let
   srcStr = toString src;
diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 36a48ce9f17..40ead021cdb 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -1,4 +1,4 @@
-{stdenvNoCC, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:
+{stdenvNoCC, mercurial}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:
 
 if md5 != null then
   throw "fetchhg does not support md5 anymore, please use sha256"
diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix
index 40ba79ec435..960bc3c1ffb 100644
--- a/pkgs/build-support/fetchnuget/default.nix
+++ b/pkgs/build-support/fetchnuget/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchurl, buildDotnetPackage, unzip }:
+{ fetchurl, buildDotnetPackage, unzip }:
 
 attrs @
 { baseName
diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix
index 14dac9997d9..3dbde203374 100644
--- a/pkgs/build-support/fetchs3/default.nix
+++ b/pkgs/build-support/fetchs3/default.nix
@@ -5,7 +5,6 @@
 , sha256
 , region ? "us-east-1"
 , credentials ? null # Default to looking at local EC2 metadata service
-, executable ? false
 , recursiveHash ? false
 , postFetch ? null
 }:
diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index 7f21b66ce12..6c7dd67c400 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -53,7 +53,7 @@ let makeDeps = dependencies:
     '';
 
     configureCrate =
-      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }:
+      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, workspace_member, extraLinkFlags }:
       let version_ = lib.splitString "-" crateVersion;
           versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
           version = lib.splitString "." (lib.head version_);
@@ -181,9 +181,9 @@ let makeDeps = dependencies:
       runHook postConfigure
     '';
 
-    buildCrate = { crateName, crateVersion, crateAuthors,
-                   dependencies, completeDeps, completeBuildDeps,
-                   crateFeatures, libName, build, release, libPath,
+    buildCrate = { crateName,
+                   dependencies,
+                   crateFeatures, libName, release, libPath,
                    crateType, metadata, crateBin, finalBins,
                    extraRustcOpts, verbose, colors }:
 
@@ -422,16 +422,16 @@ stdenv.mkDerivation (rec {
     colors = lib.attrByPath [ "colors" ] "always" crate;
     extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
     configurePhase = configureCrate {
-      inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
+      inherit crateName buildDependencies completeDeps completeBuildDeps
               crateFeatures libName build workspace_member release libPath crateVersion
               extraLinkFlags
               crateAuthors verbose colors;
     };
     extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
     buildPhase = buildCrate {
-      inherit crateName dependencies completeDeps completeBuildDeps
-              crateFeatures libName build release libPath crateType
-              crateVersion crateAuthors metadata crateBin finalBins verbose colors
+      inherit crateName dependencies
+              crateFeatures libName release libPath crateType
+              metadata crateBin finalBins verbose colors
               extraRustcOpts;
     };
     installPhase = installCrate crateName metadata;
diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
index ac6bb6ab1bd..486f365f78a 100644
--- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
+++ b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
@@ -1,5 +1,5 @@
 # Generated by carnix 0.5.2: carnix Cargo.lock -o cargo-vendor.nix
-{ lib, buildPlatform, buildRustCrate, fetchgit }:
+{ lib, buildPlatform, buildRustCrate }:
 let kernel = buildPlatform.parsed.kernel.name;
     abi = buildPlatform.parsed.abi.name;
     hasFeature = feature:
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 59e8c3e7f7e..fb1d6e390ae 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, stdenv, path, cacert, git, rust, cargo-vendor }:
+{ stdenv, cacert, git, rust, cargo-vendor }:
 let
   fetchcargo = import ./fetchcargo.nix {
     inherit stdenv cacert git rust cargo-vendor;
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix
index db2bef367e9..5179f47eaa5 100644
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@@ -8,8 +8,7 @@
 , vmTools
 , gawk
 , utillinux
-, e2fsprogs
-, squashfsTools }:
+, e2fsprogs }:
 
 rec {
   shellScript = name: text:
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index c2e64cb63dd..909985d945b 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
 let
   version = "2.04";
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 4fc47793661..f7fce315e8c 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,7 +1,6 @@
 {
   stdenv, lib,
   fetchFromGitHub, fetchurl,
-  runCommand, writeText,
   nodejs, ttfautohint-nox, otfcc,
 
   # Custom font set options.
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 33435c98267..0a086453244 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
+{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
 
 let
   mkNoto = { name, weights, sha256, }:
diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix
index 1cbf7168ea9..a801886350d 100644
--- a/pkgs/data/fonts/tex-gyre/default.nix
+++ b/pkgs/data/fonts/tex-gyre/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  mkVariant = variant: { displayName, version, abbreviation, sha256, outputHash }: stdenv.mkDerivation {
+  mkVariant = variant: { version, abbreviation, sha256, outputHash }: stdenv.mkDerivation {
     name = "tex-gyre-${variant}-${version}";
     inherit version;
 
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index e867d0fbb4b..aa6a42badb7 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, nss, python
+{ stdenv, fetchurl, nss, python
 , blacklist ? []
 , includeEmail ? false
 }:
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
index bc51ceeca43..3d8e16443db 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation {
   name = "docbook-xml-ebnf-1.2b1";
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
index d4cb7bc889d..35e69641f11 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix
@@ -12,7 +12,7 @@ let
 in
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.1.2";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.1.2/docbkx412.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
index d2cc69559b8..f8c827e826d 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, findXMLCatalogs}:
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.2";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
index e1f9337df94..2c253a1029d 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, findXMLCatalogs}:
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.3";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
index 1a9d622affc..d051d205808 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, findXMLCatalogs}:
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.4";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
index 301b400ac7e..156ee653bbe 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip, findXMLCatalogs}:
 
 import ./generic.nix {
-  inherit stdenv fetchurl unzip findXMLCatalogs;
+  inherit stdenv unzip findXMLCatalogs;
   name = "docbook-xml-4.5";
   src = fetchurl {
     url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip;
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
index 10b76f7b2b5..41c4b73d3f6 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }:
+{ stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }:
 
 stdenv.mkDerivation {
   inherit src name postInstall;
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index dc538625bf0..9119d5e93d8 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
   xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
-  luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, mesa_noglu,
+  luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_noglu,
   xkeyboard_config, pcre
 }:
 
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 276bc7e79c1..c4f6ad8207c 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python
+{ stdenv, fetchurl, pkgconfig, dbus-glib, libxml2Python, libxslt, libxklavier, popt, which, python
 , shared-mime-info, desktop-file-utils, libunique, libtool, bzip2
-, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
+, gtk, gnome-doc-utils, intltool, GConf, libglade, libgnomeui, libgnomekbd
 , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon
-, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2
 , libSM, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
index d85b5494da4..3bef218740c 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, dbus-glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python
-, glib, gtk, pango, atk, libXau, libcanberra-gtk2
+{ stdenv, fetchurl, pkgconfig, dbus-glib, popt, which, libxml2Python, libxslt, bzip2, python
+, gtk, libXau, libcanberra-gtk2
 , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome-desktop
-, libwnck, librsvg, libgweather, gnome-doc-utils, libgnomecanvas, libart_lgpl, libtasn1, libtool, xorg }:
+, libwnck, librsvg, libgweather, gnome-doc-utils, libtasn1, libtool, xorg }:
 
 stdenv.mkDerivation {
   name = "gnome-panel-2.32.1";
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index d4935c498f1..c14ee25981c 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:
+{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:
 
 stdenv.mkDerivation rec {
   rev = "9ae8768";
diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
index a9b692aadf5..0233f6340f5 100644
--- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk
+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gtk
 , gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
index 029d751e719..5ae126df331 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo, ORBit2}:
+{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo}:
 
 stdenv.mkDerivation {
   name = "gnome-vfs-monikers-2.15.3";
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index ee0bf5f82a0..bf0cec8dfbe 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt
+{ stdenv, fetchurl, flex, bison, pkgconfig, glib, libxml2, popt
 , intltool, ORBit2, procps }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index 2dcb85235ee..42f47bc5a83 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2
-, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg
+, intltool, libbonobo, GConf, gnome_vfs, libtool, libogg
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index b07417ecc35..b5525957d46 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook
-, gobjectIntrospection, gjs, gdk_pixbuf, librsvg, libunistring }:
+, gobjectIntrospection, gjs, libunistring }:
 
 stdenv.mkDerivation rec {
   name = "gnome-characters-${version}";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 7db21d9e748..a7d4288c9eb 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -1,10 +1,10 @@
 { stdenv, meson, ninja, gettext, fetchurl, evince, gjs
 , pkgconfig, gtk3, glib, tracker, tracker-miners
-, itstool, libxslt, webkitgtk, libgdata, gnome-online-accounts
+, itstool, libxslt, webkitgtk, libgdata
 , gnome-desktop, libzapojit, libgepub
-, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
-, gobjectIntrospection, json-glib, inkscape, poppler_utils
-, gmp, desktop-file-utils, wrapGAppsHook }:
+, gnome3, gdk_pixbuf, libsoup, docbook_xsl
+, gobjectIntrospection, inkscape, poppler_utils
+, desktop-file-utils, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "gnome-documents-${version}";
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 560d8446f08..eef91ec0fbb 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker
 , libxml2, python3, libnotify, wrapGAppsHook, libmediaart
 , gobjectIntrospection, gnome-online-accounts, grilo, grilo-plugins
-, pkgconfig, gtk3, glib, cairo, desktop-file-utils, appstream-glib
+, pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib
 , itstool, gnome3, gst_all_1 }:
 
 python3.pkgs.buildPythonApplication rec {
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 4ae67f9b41d..d3bb75d1f97 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme
+{ stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme
 , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
 , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib
 , gnome3, wrapGAppsHook, telepathy-logger, gspell }:
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 60e8822135c..1bcf7783900 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, vala
 , pkgconfig, gtk3, glib
 , wrapGAppsHook, itstool, gnupg, libsoup
-, gnome3, librsvg, gdk_pixbuf, gpgme
+, gnome3, gpgme
 , libsecret, avahi, p11-kit, openssh }:
 
 let
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 400b3ea9a9b..71779c17280 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, dbus-glib, gnome3
-, libxml2, docbook_xsl, makeWrapper }:
+, libxml2, docbook_xsl }:
 
 let
   pname = "dconf";
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 98cfc686e97..089c32d602e 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -1,12 +1,12 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
 , file, librsvg, gnome3, gdk_pixbuf
-, dbus-glib, telepathy-glib, telepathy-farstream
+, telepathy-glib, telepathy-farstream
 , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts
 , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control
 , telepathy-logger, libnotify, clutter, libsoup, gnutls
 , evolution-data-server, yelp-xsl
 , libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info
-, bash, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee
+, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee
 , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 2f7452dbc57..5ceba1a7719 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus
+{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
 , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
 , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
 , librsvg, coreutils, xwayland }:
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 772df5d2441..c3b2f97f9b2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -2,7 +2,7 @@
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
 , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
 , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
-, libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook
+, libpulseaudio, libical, gobjectIntrospection, gstreamer, wrapGAppsHook
 , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
 , sassc, systemd, gst_all_1 }:
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 6cb827bc504..1938c90a825 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
+{ stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }:
 
 stdenv.mkDerivation rec {
   name = "gnome-user-docs-${version}";
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 509c10d7564..da117a53691 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, apacheHttpd, nautilus
-, pkgconfig, gtk3, glib, libxml2, gnused, systemd
-, bash, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
+, pkgconfig, gtk3, glib, libxml2, systemd
+, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
 , gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index c6000352ab0..35e2012c531 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
+{ stdenv, fetchurl, pkgconfig, intltool, sqlite
 , gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp-av
 , gmime, json-glib, avahi, tracker, dleyna-server, itstool }:
 
diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
index e5ca314c69a..5dc6137c9fc 100644
--- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
   # just for passthru
-, gnome3, gtk3, gsettings-desktop-schemas }:
+, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "gsettings-desktop-schemas-${version}";
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 1562c42b374..861702a3986 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme
-, glib, desktop-file-utils, bash, appdata-tools, gtk-doc, autoconf, automake, libtool
+, glib, desktop-file-utils, appdata-tools, gtk-doc, autoconf, automake, libtool
 , wrapGAppsHook, gnome3, itstool, libxml2
 , callPackage, unzip, gobjectIntrospection }:
 
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 2daaf2d4326..5beabd08fa3 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook
-, gtk, gnome3, gnome-autoar, glib, dbus-glib, shared-mime-info, libnotify, libexif
+, gtk, gnome3, gnome-autoar, dbus-glib, shared-mime-info, libnotify, libexif
 , exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }:
 
 let
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 114c0d8ac96..100a2727fc3 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
-, clutter-gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
+, clutter-gtk, clutter-gst, gnome3, gtksourceview
 , webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
 , gdk_pixbuf, librsvg, gtk3, harfbuzz }:
 
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 7cf1872da5a..1a7e257f929 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter
+{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1
 , clutter-gtk, clutter-gst, python3Packages, shared-mime-info
 , pkgconfig, gtk3, glib, gobjectIntrospection
-, bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg
+, wrapGAppsHook, itstool, libxml2, vala, gnome3
 , gdk_pixbuf, tracker, nautilus }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index ed313221e56..17385ab7202 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, intltool, pkgconfig
 , gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls
-, fetchFromGitHub, autoconf, automake, libtool, gtk-doc, gperf, pcre2
+, gperf, pcre2
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index f904a90454f..6abaff8e32b 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, pkgconfig, bash
+{ stdenv, intltool, fetchurl, pkgconfig
 , itstool, libxml2, libxslt, gnome3 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index b9788106342..7f9996d17d9 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
+{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3
 , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 47a0238a7fd..395e90d263e 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, pkgs }:
+{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-system-monitor-${version}";
diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
index 84a9d26c2d7..f9c45f45ea4 100644
--- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib, gettext, bash }:
+{ stdenv, fetchFromGitHub, glib, gettext }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extension-topicons-plus-${version}";
diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
index 8194e3f1699..f8d29612223 100644
--- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
+{ stdenv, fetchurl, pkgconfig, glib
 , gnome3, libsoup, json-glib, gobjectIntrospection }:
 
 let
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index 32da3a9a4b8..d2dce9d6f1b 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib
 , json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection
-, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret
-, libsoup }:
+, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret
+ }:
 
 let
   pname = "gitg";
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index a7c69de44eb..41206b71d42 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, meson, ninja, gettext, fetchurl, atk
+{ stdenv, meson, ninja, gettext, fetchurl
 , pkgconfig, gtk3, glib, libsoup
-, bash, itstool, libxml2, python3Packages
-, gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
+, itstool, libxml2, python3Packages
+, gnome3, gdk_pixbuf, libnotify, gobjectIntrospection, wrapGAppsHook }:
 
 let
   pname = "gnome-tweaks";
diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix
index ce7bb6f75b5..a10675ab803 100644
--- a/pkgs/desktops/gnome-3/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3
 , mysqlSupport ? false, mysql ? null
 , postgresSupport ? false, postgresql ? null
 }:
diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix
index 210b72292fd..d5018a4350f 100644
--- a/pkgs/desktops/gnustep/gworkspace/default.nix
+++ b/pkgs/desktops/gnustep/gworkspace/default.nix
@@ -1,6 +1,5 @@
 { back, base, gui, gsmakeDerivation
 , fetchurl
-, sqlite
 , system_preferences
 }:
 let
diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix
index 00b96cd2fac..7bb287c3fa5 100644
--- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix
+++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, make, makeWrapper, which }:
+{ stdenv, make, makeWrapper, which }:
 { buildInputs ? [], ...} @ args:
 stdenv.mkDerivation (args // {
   buildInputs = [ makeWrapper make which ] ++ buildInputs;
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index 191fe0796e8..ba4937a7227 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, xorg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 40c25b3302c..675368c9a69 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, makeScope, libsForQt5, fetchFromGitHub }:
+{ pkgs, makeScope, libsForQt5 }:
 
 let
   packages = self: with self; {
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index eda4e9b05bc..59316039b36 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus-glib, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "mate-applets-${version}";
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 6a24e67d2c7..4138a042856 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook
 , pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio
 }:
 
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 8d6d470727d..bdf5ac29ca6 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, mate, gnome3, gtk2, gtk_engines,
+{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk_engines,
   gtk-engine-murrine, gdk_pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 0b1668038f5..2c99713bcd4 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -26,8 +26,7 @@ existing packages here and modify it as necessary.
 
 {
   libsForQt5, lib, fetchurl,
-  gconf, gsettings-desktop-schemas,
-  debug ? false,
+  gconf, gsettings-desktop-schemas
 }:
 
 let
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index e23ffd3644a..398fc356fc9 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation,
   extra-cmake-modules, kdoctools,
-  kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio,
+  kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kio,
   knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
   plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays
 }:
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 2c9d824999e..a0b09e30338 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore, fetchpatch,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
 
   epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
index 28c586382b4..8e5bffd9dd6 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup
-, makeWrapper, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
+, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   p_name  = "xfce4-screenshooter";
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix
index 2d5a169a215..3f6237d6de1 100644
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, polkit
 , libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg
 , hicolor-icon-theme
 }:
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
index 4db9e03ae72..7134d29c9ff 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, substituteAll, cmake, vala, glib, gtk2, gtk3 }:
+{ stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }:
 stdenv.mkDerivation rec {
   name = "vala-panel-appmenu-xfce-${version}";
   version = "0.6.94";
diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix
index dfdd8141aaa..45186914604 100644
--- a/pkgs/development/arduino/platformio/default.nix
+++ b/pkgs/development/arduino/platformio/default.nix
@@ -1,5 +1,5 @@
 
-{ pkgs, newScope }:
+{ newScope }:
 
 let
   callPackage = newScope self;
diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix
index 968c845a011..ec5e08ffda4 100644
--- a/pkgs/development/compilers/boo/default.nix
+++ b/pkgs/development/compilers/boo/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant
-, shared-mime-info, gtksourceview, gtk2
-, targetVersion ? "4.5" }:
+{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant
+, shared-mime-info, gtksourceview, gtk2 }:
 
 let
   release = "alpha";
diff --git a/pkgs/development/compilers/chicken/eggDerivation.nix b/pkgs/development/compilers/chicken/eggDerivation.nix
index bcb7a763fb6..2a14a997e57 100644
--- a/pkgs/development/compilers/chicken/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/eggDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchegg, chicken, makeWrapper }:
+{ stdenv, chicken, makeWrapper }:
 { name, src
 , buildInputs ? []
 , chickenInstallFlags ? []
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index 6bfb71a9627..6ff2028e3c1 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub
   , llvmPackages
   , cmake, boehmgc, gmp, zlib, ncurses, boost
-  , waf, python, git, sbcl
+  , python, git, sbcl
 }:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index b7c310cf01d..e44c21abe94 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, makeWrapper, fetchurl, requireFile, patchelf, perl, ncurses, expat, python27, zlib
+{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses, expat, python27, zlib
 , gcc48, gcc49, gcc5, gcc6
 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
 }:
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index e7cb7495c90..f16be1b2822 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -6,7 +6,6 @@
 , libuuid
 , zlib
 , curl
-, patchelf
 }:
 
 let
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 8ed34cf9d1e..6a8d5f11b75 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, fetchpatch, makeWrapper }:
+{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper }:
 
 # To update:
 # 1) Update versions in ./update-elm.rb and run it.
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index 8e268aa7eb7..e03039cb5e1 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,5 +1,5 @@
-{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, pkgs
-, jre, binaryen, enableWasm ? true ,  python2Packages, cmake
+{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler
+, jre, binaryen, enableWasm ? true ,  cmake
 }:
 
 let
diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
index 5317cf25d41..06acebd2ba4 100644
--- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
+++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
@@ -1,4 +1,4 @@
-{ emscriptenVersion, stdenv, llvm, fetchFromGitHub, cmake, python, gtest, ... }:
+{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, ... }:
 
 let
   rev = emscriptenVersion;
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index ce198786600..4dab2e06f48 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, glib, glibc, git,
+{ stdenv, fetchurl, fetchFromGitHub, glib, git,
   rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
   libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext,
   libGLU, libXmu, libXt, libICE, libSM }:
diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix
index 202e5525422..72530f99cdb 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@@ -1,4 +1,4 @@
-{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, git-version, SRC }:
+{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, SRC }:
 
 stdenv.mkDerivation rec {
   name    = "gambit-${version}";
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 93f1d9184b4..77e8fb51602 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -2,7 +2,6 @@
 
 callPackage ./build.nix {
   version = "4.8.9";
-  git-version = "4.8.9";
 
   SRC = fetchurl {
     url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz";
diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix
index 545bece12c4..169ddb5a6a3 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@@ -2,7 +2,6 @@
 
 callPackage ./build.nix {
   version = "unstable-2018-05-30";
-  git-version = "4.8.9-54-gffe8841b";
   SRC = fetchgit {
     url = "https://github.com/feeley/gambit.git";
     rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5";
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 15071fd2ba5..943391611de 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -28,7 +28,6 @@
 , # Strip kills static libs of other archs (hence no cross)
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 006cbdf40dc..bf3b192e1bb 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -28,7 +28,6 @@
 , # Strip kills static libs of other archs (hence no cross)
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index f360ed135d7..0564329967e 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -29,7 +29,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 02a00350162..50d55aef234 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -29,7 +29,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 84323cca823..0c51868aef8 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -22,7 +22,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 85c03bc440f..38d8bcd83cf 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+{ stdenv, targetPackages, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
@@ -22,7 +22,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
 }:
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index b00f180bbc7..124fdbcdf9d 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -22,7 +22,6 @@
   stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
-, darwin ? null
 , flex ? null
 , buildPlatform, hostPlatform, targetPlatform
 , buildPackages
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index 2a80eccfb40..71a6eaa8db8 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, mpfr, m4, binutils, fetchcvs, emacs, zlib, which
+{ stdenv, fetchgit, mpfr, m4, binutils, emacs, zlib, which
 , texinfo, libX11, xproto, inputproto, libXi, gmp, readline, strace
 , libXext, xextproto, libXt, libXaw, libXmu } :
 
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 0e4d5bed051..f503427b326 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mpfr, m4, binutils, fetchcvs, emacs, zlib, which
+{ stdenv, fetchurl, mpfr, m4, binutils, emacs, zlib, which
 , texinfo, libX11, xproto, inputproto, libXi, gmp
 , libXext, xextproto, libXt, libXaw, libXmu } :
 
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index 5609de15d4c..0ce9fbb00e2 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeStaticLibraries,
+{ stdenv, makeStaticLibraries,
   coreutils, rsync, bash,
   openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
   version, git-version, GAMBIT, SRC }:
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 2a906d918aa..0cf3a4cb12b 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -3,10 +3,10 @@
 
 # build-tools
 , bootPkgs, hscolour
-, coreutils, fetchurl, fetchpatch, perl
+, coreutils, fetchurl, perl
 , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 8062e93df54..7671fcdb025 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -5,7 +5,7 @@
 , bootPkgs, hscolour
 , coreutils, fetchpatch, fetchurl, perl, sphinx
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index d740a7ee673..c24cdeb43bf 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -6,7 +6,7 @@
 , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx
 , runCommand
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index 182afa6b349..c93fb1fd9b2 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -5,7 +5,7 @@
 , bootPkgs, alex, happy, hscolour
 , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 522ad32e69f..ae22e1f1e40 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -3,9 +3,9 @@
 
 # build-tools
 , bootPkgs, alex, happy, hscolour
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
+, autoconf, automake, coreutils, fetchurl, perl, python3, m4
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 4c1e5d986dc..2824ce669ee 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -5,7 +5,7 @@
 , bootPkgs, alex, happy, hscolour
 , autoconf, automake, coreutils, fetchgit, perl, python3, m4
 
-, libffi, libiconv ? null, ncurses
+, libiconv ? null, ncurses
 
 , useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform)
 , # LLVM is conceptually a run-time-only depedendency, but for
diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
index 57d9fccd266..df1394e4a24 100644
--- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
+++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
@@ -4,7 +4,6 @@
 , python3
 , gcc
 , cabal-install
-, gmp
 , runCommand
 , lib
 , stdenv
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index f09a577110b..46e9d8d72be 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -3,7 +3,6 @@
 , broken ? false
 , test-framework
 , test-framework-hunit
-, test-framework-quickcheck2
 , data-default
 , ghc-paths
 , haskell-src-exts
@@ -20,10 +19,8 @@
 , transformers-compat
 , haddock-api
 , regex-posix
-, callPackage
 
 , bootPkgs, gmp
-, jailbreak-cabal
 
 , runCommand
 , nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
@@ -32,11 +29,11 @@
 , lens
 , parallel, safe, shelly, split, stringsearch, syb
 , tar, terminfo
-, vector, yaml, fetchgit, fetchFromGitHub, Cabal
+, vector, yaml, fetchgit, fetchFromGitHub
 , alex, happy, git, gnumake, autoconf, patch
 , automake, libtool
 , cryptohash
-, haddock, hspec, xhtml, primitive, cacert, pkgs
+, haddock, hspec, xhtml, pkgs
 , coreutils
 , libiconv
 
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index b4fa005c3de..272c953af7a 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
 , perl, which, pkgconfig, patch, procps
 , pcre, cacert, llvm
-, Security, Foundation, bash
+, Security, Foundation
 , makeWrapper, git, subversion, mercurial, bazaar }:
 
 let
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 8ef528e2c92..cbaa427c827 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
 , perl, which, pkgconfig, patch, procps
 , pcre, cacert, llvm
-, Security, Foundation, bash
+, Security, Foundation
 , makeWrapper, git, subversion, mercurial, bazaar }:
 
 let
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 79446744371..52a49c519b3 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchhg, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }:
+{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, mercurial, python27, zlib, makeWrapper, oraclejdk8 }:
 
 let
   # pre-download some cache entries ('mx' will not be able to download under nixbld1)
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index afeef2b3637..0a974fccc88 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, bash, coreutils, ocaml, zlib, pcre, neko, camlp4 }:
+{ stdenv, fetchgit, coreutils, ocaml, zlib, pcre, neko, camlp4 }:
 
 let
   generic = { version, sha256, prePatch }:
diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix
index 7f1830430c4..a6955c03051 100644
--- a/pkgs/development/compilers/inform7/default.nix
+++ b/pkgs/development/compilers/inform7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, fetchzip, coreutils, perl, gnutar, gzip }:
+{ stdenv, fetchzip, coreutils, perl, gnutar, gzip }:
 let
   version = "6M62";
 in stdenv.mkDerivation {
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix
index 9c4b38f87de..e64c0c912d9 100644
--- a/pkgs/development/compilers/ios-cross-compile/9.2.nix
+++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix
@@ -1,6 +1,6 @@
 { stdenv, git, clang,
   fetchFromGitHub, requireFile,
-  openssl, xz, gnutar, gcc,
+  openssl, xz, gnutar,
   automake, autoconf, libtool, clangStdenv } :
 
 clangStdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 7aedf191abe..a5d6247ffdc 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, fetchpatch, bash, which, m4, python, bison, flex, llvmPackages,
+{stdenv, fetchFromGitHub, fetchpatch, which, m4, python, bison, flex, llvmPackages,
 testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents
 }:
 
diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index cff6c1c446f..e503b7a92ce 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchgit, fetchurl, fetchzip
+{ stdenv, fetchurl, fetchzip
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, runCommand
 , paxctl
 # libjulia dependencies
 , libunwind, readline, utf8proc, zlib
-, llvm, libffi, ncurses
+, llvm
 # standard library dependencies
 , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
 # linear algebra
diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix
index 49bbaf0e8df..fcf486b3b41 100644
--- a/pkgs/development/compilers/julia/0.6.nix
+++ b/pkgs/development/compilers/julia/0.6.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchgit, fetchurl, fetchzip
+{ stdenv, fetchurl, fetchzip
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, runCommand
 , paxctl
 # libjulia dependencies
 , libunwind, readline, utf8proc, zlib
-, llvm, libffi, ncurses
+, llvm
 # standard library dependencies
 , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
 # linear algebra
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index b5a3a8c6be2..a504dc2ea46 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl
+{ stdenv, fetchurl
 # build tools
 , gfortran, m4, makeWrapper, patchelf, perl, which, python2, paxctl
 # libjulia dependencies
diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 48301a8f287..dc6a933a934 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata
+{ stdenv, fetchurl, cmake, llvm, curl, tzdata
 , python, libconfig, lit, gdb, unzip, darwin, bash
 , callPackage, makeWrapper, targetPackages
 , bootstrapVersion ? false
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 0b29b04825a..25bb0828414 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -8,7 +8,6 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , zlib
diff --git a/pkgs/development/compilers/llvm/3.5/dragonegg.nix b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
index 96d4f9f558c..d54ffd96382 100644
--- a/pkgs/development/compilers/llvm/3.5/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/3.5/dragonegg.nix
@@ -1,4 +1,4 @@
-{stdenv, fetch, fetchpatch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
+{stdenv, fetch, llvm, gmp, mpfr, libmpc, ncurses, zlib, version}:
 
 stdenv.mkDerivation rec {
   name = "dragonegg-${version}";
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index 1bd4b88c72d..f176894dedb 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -1,5 +1,5 @@
-{ newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl
-, overrideCC, wrapCCWith, darwin
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl
+, overrideCC, wrapCCWith
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index 1654914ff8c..98b6f4adbbf 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -8,7 +8,6 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , zlib
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index 28f908ee829..99869e6e80a 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index a6fb6119817..8cfcb1af43d 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -8,7 +8,6 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , zlib
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index ea3ea36eb6d..01c08f4bd20 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 458ad7db8ef..c974eb6f6d3 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -8,14 +8,12 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , zlib
 , compiler-rt_src
 , debugVersion ? false
 , enableSharedLibraries ? (buildPlatform == hostPlatform)
-, darwin
 , buildPackages
 , buildPlatform
 , hostPlatform
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index ae674d1fa8e..75037f6a07d 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -1,6 +1,5 @@
-{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
+{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
-, darwin
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 6ce9c0d4792..2b543b9d793 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }:
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index 776109ee74d..21b0c1c3601 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -1,9 +1,7 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
-, python
 , version
 }:
 
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index e9140d3fcc6..514c3a006e3 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -6,7 +6,6 @@
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , release_version
@@ -15,7 +14,6 @@
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
-, darwin
 }:
 
 let
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix
index 0bdf5c71e1f..a8a6b3dfea8 100644
--- a/pkgs/development/compilers/llvm/4/openmp.nix
+++ b/pkgs/development/compilers/llvm/4/openmp.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
 , perl
 , version
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index 07738048f8e..5fd0271f026 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index ef2e1c29088..00b0083108b 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -1,6 +1,5 @@
-{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
+{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
-, darwin
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index 5492e12da98..c7b4615e374 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }:
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix
index 05801f2f08f..9a47435cf14 100644
--- a/pkgs/development/compilers/llvm/5/lld.nix
+++ b/pkgs/development/compilers/llvm/5/lld.nix
@@ -1,9 +1,7 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
-, python
 , version
 }:
 
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 31750e2d0da..68eebc33c6b 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -1,12 +1,10 @@
 { stdenv
 , fetch
-, fetchpatch
 , cmake
 , python
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , release_version
@@ -15,7 +13,6 @@
 , debugVersion ? false
 , enableManpages ? false
 , enableSharedLibraries ? true
-, darwin
 }:
 
 let
diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix
index 5c2b7501f97..901015bf2ff 100644
--- a/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/pkgs/development/compilers/llvm/5/openmp.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
 , perl
 , version
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 88214418406..84056749678 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 66f0facc952..141daa88dcf 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -1,6 +1,5 @@
-{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
+{ lowPrio, newScope, stdenv, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
-, darwin
 , buildLlvmTools # tools, but from the previous stage, for cross
 , targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index c1f0b9f6129..1f87cb83ab0 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetch, cmake, python, llvm, libcxxabi, fixDarwinDylibNames, version }:
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix
index 818ad47a335..1e68276945e 100644
--- a/pkgs/development/compilers/llvm/6/lld.nix
+++ b/pkgs/development/compilers/llvm/6/lld.nix
@@ -3,7 +3,6 @@
 , cmake
 , libxml2
 , llvm
-, python
 , version
 }:
 
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 6fc448574f4..a86f5b5039e 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -1,12 +1,10 @@
 { stdenv
 , fetch
-, fetchpatch
 , cmake
 , python
 , libffi
 , libbfd
 , libxml2
-, valgrind
 , ncurses
 , version
 , release_version
@@ -15,7 +13,6 @@
 , enableManpages ? false
 , enableSharedLibraries ? true
 , enableWasm ? true
-, darwin
 }:
 
 let
diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix
index 16093758e82..908a5f1218f 100644
--- a/pkgs/development/compilers/llvm/6/openmp.nix
+++ b/pkgs/development/compilers/llvm/6/openmp.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetch
 , cmake
-, zlib
 , llvm
 , perl
 , version
diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix
index 58fb0ca22d7..63e5b50c3d4 100644
--- a/pkgs/development/compilers/matter-compiler/default.nix
+++ b/pkgs/development/compilers/matter-compiler/default.nix
@@ -1,5 +1,5 @@
 
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "matter_compiler-0.5.1";
diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix
index cdf201cec7a..9ce7c9166bc 100644
--- a/pkgs/development/compilers/mcpp/default.nix
+++ b/pkgs/development/compilers/mcpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mcpp }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mcpp-2.7.2";
diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix
index f13883db74f..892ae99abaf 100644
--- a/pkgs/development/compilers/mono/4.0.nix
+++ b/pkgs/development/compilers/mono/4.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
   version = "4.0.4.1";
diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix
index f80cffe220e..9a3ccd1fd86 100644
--- a/pkgs/development/compilers/mono/4.4.nix
+++ b/pkgs/development/compilers/mono/4.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix
index 7c9918cdd39..2bba660b69c 100644
--- a/pkgs/development/compilers/mono/4.6.nix
+++ b/pkgs/development/compilers/mono/4.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.8.nix
index c3ba316cd13..f445127c0da 100644
--- a/pkgs/development/compilers/mono/4.8.nix
+++ b/pkgs/development/compilers/mono/4.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix
index d10d6e3e605..53820c97b1b 100644
--- a/pkgs/development/compilers/mono/5.0.nix
+++ b/pkgs/development/compilers/mono/5.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix
index 31e86f94c0a..acebb4beef6 100644
--- a/pkgs/development/compilers/mono/5.4.nix
+++ b/pkgs/development/compilers/mono/5.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/mono/5.8.nix b/pkgs/development/compilers/mono/5.8.nix
index 6db9e19807b..7b5008fd04c 100644
--- a/pkgs/development/compilers/mono/5.8.nix
+++ b/pkgs/development/compilers/mono/5.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, Foundation, libobjc }:
+{ callPackage, Foundation, libobjc }:
 
 callPackage ./generic-cmake.nix (rec {
   inherit Foundation libobjc;
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 9eec23f1ba8..21ccf77e4a2 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, patchelf }:
+{ lib, stdenv, fetchurl }:
 
 assert stdenv ? glibc;
 
diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
index 774cefb7940..f5bd3430ae7 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/pkgs/development/compilers/obliv-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
+{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
 stdenv.mkDerivation rec {
   name = "obliv-c-${version}";
   version = "0.0pre20170827";
diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix
index 7ed493fe92e..6e8d9003bf4 100644
--- a/pkgs/development/compilers/openjdk/10.nix
+++ b/pkgs/development/compilers/openjdk/10.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype
-, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir
+, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
 , libjpeg, giflib
 , setJavaClassPath
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 3c29df7ec78..612f0db0582 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -1,5 +1,5 @@
 { stdenv
-, runCommand, fetchurl, file, zlib
+, runCommand, fetchurl, zlib
 
 , version
 }:
diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
index e6e868fdf41..de063500b70 100644
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
@@ -2,11 +2,9 @@
 , stdenv
 , requireFile
 , makeWrapper
-, unzip
 , file
 , xorg ? null
 , packageType ? "JDK" # JDK, JRE, or ServerJRE
-, pluginSupport ? true
 , glib
 , libxml2
 , ffmpeg_2
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 94b89cf3a95..60388265348 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   curryBase = haskellPackages.callPackage (
     { mkDerivation, base, Cabal, containers, directory, either
-    , filepath, mtl, pretty, stdenv, syb, time
+    , filepath, mtl, pretty, syb, time
     }:
     mkDerivation {
       pname = "curry-base";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   curryFront = haskellPackages.callPackage (
     { mkDerivation, base, Cabal, containers, directory
-    , filepath, mtl, network-uri, process, stdenv, syb, transformers
+    , filepath, mtl, network-uri, process, syb, transformers
     }:
     mkDerivation {
       pname = "curry-frontend";
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
index 4c3c5d008f0..3cf6d4efe2d 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, bash, cacert, zlib, buildRustPackage, curl, darwin
+{ stdenv, makeWrapper, bash, buildRustPackage, curl, darwin
 , version
 , src
 , platform
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 46caabf3391..2ff3257c7fb 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, file, curl, pkgconfig, python, openssl, cmake, zlib
+{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
 , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin
 , version
 , patches ? []
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 099a591b407..0523e099e49 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , boost, bison, flex, openjdk, doxygen
-, perl, graphviz, libtool, ncurses, zlib, sqlite
+, perl, graphviz, ncurses, zlib, sqlite
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index abbfdd2abb7..9c1a3658590 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -27,7 +27,6 @@
 , git
 , libgit2
 , fetchFromGitHub
-, fetchpatch
 , paxctl
 , findutils
 , makeWrapper
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index f2b6016ceb7..8426635ce96 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, file, openssl, mlton
+{ stdenv, fetchurl, file, openssl, mlton
 , mysql, postgresql, sqlite, gcc
 }:
 
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index 1cc5dc368da..22721ca98bc 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coq, ncurses, which
+{ stdenv, coq, ncurses, which
 , graphviz, withDoc ? false
 , src, name
 }:
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
index a44e81d3c19..d09e47a7f84 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coq, ncurses, which
+{ stdenv, coq, ncurses, which
 , graphviz, withDoc ? false
 , src, name, patches ? []
 }:
diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix
index 1cd687058b3..ff19e52135c 100644
--- a/pkgs/development/idris-modules/build-builtin-package.nix
+++ b/pkgs/development/idris-modules/build-builtin-package.nix
@@ -1,7 +1,7 @@
 # Build one of the packages that comes with idris
 # name: The name of the package
 # deps: The dependencies of the package
-{ idris, build-idris-package, lib }: name: deps:
+{ idris, build-idris-package }: name: deps:
 let
   inherit (builtins.parseDrvName idris.name) version;
 in
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index d0ba1912e9a..d94d4a5a14d 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl, fetchpatch }:
+{ mkDerivation, fetchpatch }:
 
 mkDerivation rec {
   version = "19.3.6.6";
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 5cea1fd533f..19ac6d35592 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl }:
+{ mkDerivation }:
 
 mkDerivation rec {
   version = "20.3.8";
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix
index de00ebdf2cb..e9aa2a3dc42 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchurl }:
+{ mkDerivation }:
 
 mkDerivation rec {
   version = "21.0";
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 6ea3ac73a4b..ba0a00b3037 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
+{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
 , libxml2, libxslt, ncurses, openssl, perl, autoreconfHook
 , openjdk ? null # javacSupport
 , unixODBC ? null # odbcSupport
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index b0eeb89ce43..848b8666f27 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -2,7 +2,7 @@
 , buildPlatform, hostPlatform
 , fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
 , libffi, libtool, readline, gmp, boehmgc, libunistring
-, coverageAnalysis ? null, gnu ? null
+, coverageAnalysis ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 196c899fcea..8110598e173 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -2,7 +2,7 @@
 , buildPlatform, hostPlatform
 , fetchurl, makeWrapper, gawk, pkgconfig
 , libffi, libtool, readline, gmp, boehmgc, libunistring
-, coverageAnalysis ? null, gnu ? null
+, coverageAnalysis ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 271490c9957..09af492490c 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, readline }:
+{ stdenv, fetchurl, readline }:
 
 let
   dsoPatch = fetchurl {
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 6221bf3fb84..6d8de7bae27 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, readline, compat ? false
-, hostPlatform
-}:
+{ stdenv, fetchurl, readline, compat ? false }:
 
 let
   dsoPatch = fetchurl {
diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
index 5a4893db063..2c4f3657aac 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, readline, compat ? false
-, hostPlatform
-}:
+{ stdenv, fetchurl, readline, compat ? false }:
 
 stdenv.mkDerivation rec {
   name = "lua-${version}";
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 73b979e9ca4..9ee628f498e 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, hostPlatform }:
+{ stdenv, lib, fetchurl }:
 rec {
 
   luajit = luajit_2_1;
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 08672d28a1f..40a70623dcb 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurlBoot, buildPackages
-, enableThreading ? stdenv ? glibc, fetchpatch, makeWrapper
+, enableThreading ? stdenv ? glibc, makeWrapper
 }:
 
 with lib;
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 3032b5e4c2a..52a3c64f81c 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,6 +1,6 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
 
-{ lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
+{ lib, stdenv, fetchurl, composableDerivation, flex, bison
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index 18bc875fb33..be11b38a0b8 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ fetchurl, python2Packages }:
 
 let version = "0.9.5.1.1"; in
 
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index 2feb15b647d..2a18dbff9e6 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ fetchurl, python2Packages }:
 
 let version = "0.9.6.4"; in
 
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index d37f59250d5..fd84d924d7b 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -10,7 +10,6 @@
 , zlib
 , callPackage
 , self
-, gettext
 , db
 , expat
 , libffi
@@ -19,7 +18,7 @@
 # Some proprietary libs assume UCS2 unicode, especially on darwin :(
 , ucsEncoding ? 4
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index a8b6ffd1da9..7e583087c08 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -15,7 +15,7 @@
 , CF, configd
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 2bbdb8bdd84..588880c1e82 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -15,7 +15,7 @@
 , CF, configd
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index f8628186d79..6b9e26e99fc 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl, fetchpatch, buildPackages
-, glibc
 , bzip2
 , expat
 , libffi
@@ -16,7 +15,7 @@
 , CF, configd
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
index e0cc198c096..adee8d594f1 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl, fetchpatch
-, glibc
 , bzip2
 , expat
 , libffi
@@ -16,7 +15,7 @@
 , CF, configd
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert x11Support -> tcl != null
diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index e68cfc3148f..95a893a209c 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -4,7 +4,7 @@
 , makeWrapper, callPackage, self, gdbm, db
 , python-setup-hook
 # For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
+, packageOverrides ? (self: super: {})
 }:
 
 assert zlibSupport -> zlib != null;
diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix
index 8a13c4efce6..4d98f18eee4 100644
--- a/pkgs/development/interpreters/rebol/default.nix
+++ b/pkgs/development/interpreters/rebol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, patchelf, glibc, libX11, libXt, perl }:
+{ stdenv, fetchFromGitHub, fetchurl, glibc, libX11, libXt, perl }:
 
 stdenv.mkDerivation rec {
   name = "rebol-nightly-${version}";
diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix
index 31ef51802ed..594bbc05b7c 100644
--- a/pkgs/development/interpreters/self/default.nix
+++ b/pkgs/development/interpreters/self/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }:
+{ fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }:
 
 stdenv.mkDerivation rec {
   # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self 
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 3bf4ba2dc2f..a472ccaafbf 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv
 
 # Version specific stuff
 , release, version, src
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix
index a6dfec49b2a..77154b54fd8 100644
--- a/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/pkgs/development/interpreters/unicon-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, gdbm, libX11, libXt }:
+{ stdenv, fetchurl, unzip, libX11, libXt }:
 
 stdenv.mkDerivation rec {
   name = "unicon-lang-${version}";
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index cceec44e6ae..a3c3b2bf96f 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
+{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
 
 let
   # workaround https://github.com/NixOS/nixpkgs/issues/37364
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index df87f51768d..ca7cc7027be 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -6,7 +6,7 @@ with pkgs.javaPackages;
 let
   collections = import ./collections.nix { inherit pkgs; };
   fetchMaven = pkgs.callPackage ./m2install.nix { };
-  plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; };
+  plugins = import ./mavenPlugins.nix { inherit pkgs; };
   poms = import ./poms.nix { inherit fetchMaven; };
 in rec {
   # Maven needs all of these to function
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index e9ce5b1ce8c..8cc79dc1d22 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, maven }:
+{ pkgs }:
 
 with pkgs;
 with pkgs.javaPackages;
diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix
index 912ea53c3d3..60fafd60ad0 100644
--- a/pkgs/development/libraries/arguments/default.nix
+++ b/pkgs/development/libraries/arguments/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libminc, bicpl }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "arguments";
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 219c8df803b..24e06b0d65a 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }:
+{ stdenv, fetchFromGitHub, cmake, boost, zlib }:
 
 stdenv.mkDerivation rec {
   name = "assimp-${version}";
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
index 703679ba3a5..ec93e2f6467 100644
--- a/pkgs/development/libraries/audio/libbass/default.nix
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, unzip, fetchurl, writeText }:
+{ stdenv, unzip, fetchurl }:
 
 let
   version = "24";
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix
index 8b787855c4d..580cd1bd73f 100644
--- a/pkgs/development/libraries/avro-c/default.nix
+++ b/pkgs/development/libraries/avro-c/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, cmake, fetchurl, pkgconfig, jansson, zlib }:
+{ stdenv, cmake, fetchurl, pkgconfig, jansson, zlib }:
 
 let
   version = "1.8.2";
diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix
index 8805dc74a26..093bb811489 100644
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, belr }:
+{ stdenv, cmake, fetchFromGitHub, bctoolbox, belr }:
 
 stdenv.mkDerivation rec {
   baseName = "belcard";
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 003fce0ea8c..09ca4908d78 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub
+{ stdenv, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub
   , cmake, zlib, bctoolbox
 }:
 
diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix
index 214abb21f2c..736c9a2f9e0 100644
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }:
+{ stdenv, cmake, fetchFromGitHub, bctoolbox }:
 
 stdenv.mkDerivation rec {
   baseName = "belr";
diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix
index cdc660ca3f3..11b94a0181a 100644
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox, sqlite }:
+{ stdenv, cmake, fetchFromGitHub, bctoolbox, sqlite }:
 
 stdenv.mkDerivation rec {
   baseName = "bzrtp";
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 1e764aff4cc..397e80961e0 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "actor-framework-${version}";
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 4486149cfce..db46412ceb5 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv
+{ stdenv, fetchurl, pkgconfig, libiconv
 , libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
 , gobjectSupport ? true, glib
 , xcbSupport ? true # no longer experimental since 1.12
diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index 47250f2b3da..a4e4968f562 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }:
+{ fetchurl, stdenv, pkgconfig, darwin, cairo, fontconfig, freetype, libsigcxx }:
 let
   ver_maj = "1.12";
   ver_min = "2";
diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 64e3690eb3e..0fc0dfb0706 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name    = "capstone-${version}";
diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index 7c44c2e0ab0..7cb75d8de0f 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, SDL, libGLU_combined, rebar, erlang, opencl-headers, ocl-icd }:
+{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
 
 stdenv.mkDerivation rec {
   version = "1.2.3";
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index eba94288e8f..705aa7252d1 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
+{ stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib,
 gobjectIntrospection, gtk3, gnome3
 }:
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index c1bf789c59b..ba5b2aa4371 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchFromGitHub, stdenv }:
+{ fetchFromGitHub, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "crypto++-${version}";
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index fb129218175..c3ca9aa442b 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -5,7 +5,7 @@
 
 # Options from inherited versions
 , version, sha256
-, patchSrc ? "src", extraPatches ? [ ]
+, extraPatches ? [ ]
 , license ? stdenv.lib.licenses.sleepycat
 , drvArgs ? {}
 }:
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index c17a140b9c5..013913e5297 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }:
+{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "dbus-sharp-${version}";
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index ea7d920dc82..40c633dda52 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }:
+{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "dbus-sharp-${version}";
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index e4d1fa2073f..62014489f30 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -2,8 +2,6 @@
 , fetchFromGitHub
 , fetchpatch
 , autoreconfHook
-, libtool
-, gettext
 , pari
 , ntl
 , gmp
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index e341ce842eb..79b29a90463 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "expat-2.2.5";
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index 51696886148..04d085bde73 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook
+{ stdenv, fetchurl, autoreconfHook
 , mp4v2Support ? true, mp4v2 ? null
 , drmSupport ? false # Digital Radio Mondiale
 }:
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index c5ce5e252fa..34c649022cf 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm
+{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
 , hostPlatform
 /*
  *  Licensing options (yes some are listed twice, filters and such are not listed)
@@ -80,7 +80,6 @@
 #, libnut ? null # NUT (de)muxer, native (de)muser exists
 , libogg ? null # Ogg container used by vorbis & theora
 , libopus ? null # Opus de/encoder
-, libsndio ? null # sndio playback/record support
 , libssh ? null # SFTP protocol
 , libtheora ? null # Theora encoder
 , libv4l ? null # Video 4 Linux support
diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix
index a3ce9ea9c2b..4607d3e2f19 100644
--- a/pkgs/development/libraries/ffmpeg-sixel/default.nix
+++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, perl, libsixel, yasm
+{ stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index 9e76c1e6400..a1cc11fb8c1 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg
+{ fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index ccf2d6d0585..2b6a949c232 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent
 , double-conversion, glog, google-gflags, python, libiberty, openssl }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index c2d99446d81..01c4140f3b5 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchurl, fetchpatch
+{ stdenv, substituteAll, fetchurl
 , pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts
 , hostPlatform
 }:
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 8b534edd249..76e89b97617 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -1,4 +1,4 @@
-{ runCommand, lib, writeText, fontconfig, fontDirectories }:
+{ runCommand, lib, fontconfig, fontDirectories }:
 
 runCommand "fc-cache"
   rec {
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix
index 2f5374851d8..e15626a160e 100644
--- a/pkgs/development/libraries/frame/default.nix
+++ b/pkgs/development/libraries/frame/default.nix
@@ -1,5 +1,5 @@
 { enableX11 ? true
-,  stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }:
+,  stdenv, fetchurl, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
   name = "frame-${version}";
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 23aa86af377..c678b46c0d2 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, lib, fetchurl, copyPathsToStore
-, hostPlatform
+{ stdenv, fetchurl
 , pkgconfig, which, makeWrapper
 , zlib, bzip2, libpng, gnumake, glib
 
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix
index 6745bc1ecf5..d700c3d3c16 100644
--- a/pkgs/development/libraries/gbenchmark/default.nix
+++ b/pkgs/development/libraries/gbenchmark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "gbenchmark-${version}";
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index d2987be6a3d..ccfa7e53611 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
+{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg
 , librsvg, pango, gtk2, bzip2, intltool, libintl
 , OpenGL ? null }:
 
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index b92f6e61f56..83030a7a014 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python }:
+{ stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
   name = "geos-3.6.2";
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index fd6e0a65abc..8a07a9f9f22 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, hostPlatform, fetchurl, gettext, pkgconfig, perl, python
+{ stdenv, fetchurl, gettext, pkgconfig, perl, python
 , libiconv, zlib, libffi, pcre, libelf, gnome3
 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
 , utillinuxMinimal ? null
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 5c504d0d8e2..8b4a213aae0 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -20,7 +20,7 @@
 { stdenv, lib
 , buildPlatform, hostPlatform
 , buildPackages
-, fetchurl, fetchpatch ? null
+, fetchurl ? null
 , linuxHeaders ? null
 , gd ? null, libpng ? null
 , bison
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
index 472ec83fb02..a81cd91fdc7 100644
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -1,6 +1,6 @@
-{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
-, tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake
+, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake
 , yacc, texinfo
 
 # Version dependent args
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 984603827c8..081d896a6e0 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+{ lib, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp, autogen, libidn, p11-kit, libiconv
 , tpmSupport ? false, trousers, which, nettools, libunistring
 , unbound, dns-root-data, gettext
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 6cdd19f307d..6155b8b18bd 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
-, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
+, libgsf, libxml2, libxslt, cairo, pango, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "goffice-0.10.39";
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 94c09b71683..e7da60a9d1a 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
+{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
 , file, which
 , autoreconfHook
 , git
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 720ff06ceaa..9c19bdbdc29 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gss, libidn, kerberos }:
+{ fetchurl, stdenv, libidn, kerberos }:
 
 stdenv.mkDerivation rec {
   name = "gsasl-1.8.0";
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 4f952359f71..37d4843db8d 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv }:
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "gsl-2.5";
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index dfd3383cdba..49216b70fe1 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, lib
 , pkgconfig, meson, ninja, gettext, gobjectIntrospection
-, python, gstreamer, orc, pango, libtheora, libvisual
+, python, gstreamer, orc, pango, libtheora
 , libintl, libopus
 , enableX11 ? stdenv.isLinux, libXv
 , enableWayland ? stdenv.isLinux, wayland
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index 8371b278040..db75705c825 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia
+{ fetchurl, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia
 , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
 , libintl
 , ApplicationServices
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index 75583624f54..9c47ef0260b 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo
-, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
-, libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
+, flac, libjpeg, speex, libpng, libdv, libcaca, libvpx
+, taglib, libpulseaudio, gdk_pixbuf, orc
 , glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
index ac680f8432a..2f46016adac 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base
-, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintl }:
+, libmad, libdvdread, a52dec, x264, orc, lame, libintl }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-0.10.19";
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 11b451e76fd..7255894f3b1 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland
-, libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm
+, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm
 , libvpx, python
 }:
 
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index f206a169b93..c0dc0753cd0 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
-, pango, pkgconfig, substituteAll, which }:
+, pango, pkgconfig, which }:
 
 stdenv.mkDerivation rec {
   name = "gtkd-${version}";
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 4f3bc64b5d4..4c858242bb5 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, meson, ninja, fetchurl, pkgconfig, gettext, gnome3
+{ stdenv, fetchurl, pkgconfig, gettext, gnome3
 , glib, libgudev, udisks2, libgcrypt, libcap, polkit
 , libgphoto2, avahi, libarchive, fuse, libcdio
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index ee8a5107b34..9f0a6c34512 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -163,6 +163,7 @@ let
       name = "hunspell-dict-${shortName}-linguistico-${version}";
       readmeFile = dictFileName + "_README.txt";
       meta = with stdenv.lib; {
+        description = "Hunspell dictionary for ${shortDescription}";
         homepage = https://sourceforge.net/projects/linguistico/;
         license = licenses.gpl3;
         maintainers = with maintainers; [ renzo ];
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index ee868d371ce..705fb816b2e 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -1,5 +1,5 @@
 { version, sha256, patches ? [], patchFlags ? "" }:
-{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames
+{ stdenv, fetchurl, fixDarwinDylibNames
   # Cross-compiled icu4c requires a build-root of a native compile
 , buildRootOnly ? false, nativeBuildRoot, buildPlatform, hostPlatform
 }:
diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix
index 3568edb7890..8abff4c5f05 100644
--- a/pkgs/development/libraries/ignition-transport/generic.nix
+++ b/pkgs/development/libraries/ignition-transport/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, utillinux,
+{ stdenv, cmake, pkgconfig, utillinux,
   protobuf, zeromq, cppzmq,
   version, src    # parametrize version and src so we can easily have pkgs
                   # for different versions
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index ed500ca518f..a5b226ee9c7 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, ghostscript }:
+{ stdenv, autoreconfHook, ghostscript }:
 
 stdenv.mkDerivation {
   name = "ijs-${ghostscript.version}";
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 4dfe190124b..d78c59e9c25 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext, python3, xz}:
+{stdenv, fetchurl, gettext, python3}:
 
 stdenv.mkDerivation rec {
   name = "iso-codes-${version}";
diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index 5280a95afb4..5f6a6f51a52 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }:
+{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }:
 
 stdenv.mkDerivation rec {
   name = "itk-4.13.0";
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 8731bd8e736..b9dcc927172 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "jbig2dec-0.14";
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index a9b5d596b39..be83dbc52f4 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext
-, gobjectIntrospection, dbus, fixDarwinDylibNames, gnome3
+, gobjectIntrospection, fixDarwinDylibNames, gnome3
 }:
 
 let
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index cd5f2163dd9..d5a407ee16f 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchurl, writeScript,
+  mkDerivation, lib,
   extra-cmake-modules,
   qtbase, qttools, shared-mime-info
 }:
diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index 7aabeb02154..34e01b4c1b6 100644
--- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, extra-cmake-modules,
   epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
-  kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative
+  kwidgetsaddons, kwindowsystem, qtdeclarative
 }:
 
 mkDerivation {
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index ae945ab7338..ca015151e0f 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation,
   extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
   qtbase, qttools, qtx11extras,
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index c0b4b631286..6779faa50cd 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, fetchurl, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   karchive, kconfig, kcoreaddons, ki18n, qtbase,
 }:
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index 3efd4cf4e2a..c633aee30a1 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore, fetchpatch,
+  mkDerivation, lib,
   extra-cmake-modules, perl,
   karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
   qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index cf4b85043bb..194b57c0534 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3
-, gtk-doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection
+, gtk-doc, gtk3, libX11, libXext, libXrender, gobjectIntrospection
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index c6c3ba53d2c..5c53f5e6ad5 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig
+{ stdenv, lib, fetchurl, extra-cmake-modules
 , qtbase, kdeFrameworks
 , libatasmart, parted
 , utillinux }:
diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix
index 3f44dbb9c13..256989992c5 100644
--- a/pkgs/development/libraries/kreport/default.nix
+++ b/pkgs/development/libraries/kreport/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, fetchurl,
   extra-cmake-modules,
-  qtbase, qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2
+  qtdeclarative, qtwebkit, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons, kproperty, marble, python2
 }:
 
 mkDerivation rec {
diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix
index 61b4559ebab..2c418c1bc5f 100644
--- a/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/pkgs/development/libraries/languagemachines/frogdata.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl
 , automake, autoconf, libtool, pkgconfig, autoconf-archive
-, libxml2, icu
-, languageMachines
 }:
 
 let
diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix
index 7defa71fc0e..01a78b5b4be 100644
--- a/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/pkgs/development/libraries/languagemachines/uctodata.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl
 , automake, autoconf, libtool, pkgconfig, autoconf-archive
-, libxml2, icu
-, languageMachines }:
+ }:
 
 let
   release = builtins.fromJSON (builtins.readFile ./release-info/LanguageMachines-uctodata.json);
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 5791b0808b4..e9ba4ae5ac2 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3, cmake }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }:
 
 stdenv.mkDerivation rec {
   version = "0.3.2";
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index fde8a06eb41..0c0fc3861c9 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, hostPlatform }:
+{ stdenv, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "libatomic_ops-${version}";
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 8b2f0b0da92..3a1b7752514 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex, gettext }:
+{ stdenv, fetchurl, libgcrypt, libgpgerror, gettext }:
 
 # library that allows libbluray to play BDplus protected bluray disks
 # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index 3f244d399f7..c02e2108f23 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPackages
-, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped
+{ stdenv
+, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped
 , libiberty, zlib
 }:
 
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 418e9cf0b57..e4864aded27 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite, gnome3
+{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, sqlite, gnome3
 , clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:
 
 let
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix
index 4f0ba439417..4f4007649d0 100644
--- a/pkgs/development/libraries/libcollectdclient/default.nix
+++ b/pkgs/development/libraries/libcollectdclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, collectd }:
+{ stdenv, collectd }:
 with stdenv.lib;
 
 collectd.overrideAttrs (oldAttrs: {
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 7f4eaa5fd14..295028abc97 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2
+{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2
 , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }:
 
 let
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index bc4cea1b470..c68e171084b 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, groff }:
+{ stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "libedit-20180525-3.1";
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index b1a6238a378..d150d4a0033 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }:
+{ fetchurl, stdenv, zlib, openssl, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
   version = "20171104";
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 05c320c42ae..5e94d00dcdb 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig
-, libtiff, giflib, libjpeg, libpng, monoDLLFixer
+, libtiff, giflib, libjpeg, libpng
 , libXrender, libexif }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 652848d8a95..29f346e9acf 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
   libstartup_notification, libgtop, perl, perlXMLParser,
-  autoreconfHook, intltool, docbook_xsl, xauth, sudo
+  autoreconfHook, intltool, docbook_xsl, xauth
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 96b42ac068c..8616a014675 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }:
+{ stdenv, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libgphoto2-${meta.version}";
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index fbe421e9974..c6056ee49fb 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,5 +1,5 @@
 {stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
-  libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib,
+  libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib,
   libimobiledevice, pythonPackages, mutagen,
   monoSupport ? true, mono, gtk-sharp-2_0
 }:
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index 6498014aee8..d0be9e25b87 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libintl, libtool, gnome3, gtk-doc }:
+{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libtool, gnome3, gtk-doc }:
 let
   pname = "libgtop";
   version = "2.38.0";
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index 516e6bbbe88..bcc85abbd3e 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, staticBuild ? false }:
+{ stdenv, buildPackages, staticBuild ? false }:
 
 let inherit (buildPackages.buildPackages) gcc; in
 
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index a153001a960..0289a5331f8 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, writeText, zlib, gperf}:
+{stdenv, fetchurl, zlib, gperf}:
 
 stdenv.mkDerivation rec {
   name = "libid3tag-${version}";
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index a100b0cc593..dd8e3c4a4f8 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libiconv, libunistring, help2man, ronn, buildPackages }:
+{ fetchurl, stdenv, libiconv, libunistring, help2man, buildPackages }:
 
 with stdenv.lib;
 
diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix
index fef5e7278b8..612de78b741 100644
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/pkgs/development/libraries/libircclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name    = "${pname}-${version}";
diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index 87cae224685..f352c8e9ed1 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd
-, doxygen, catch, pkgconfig, git
+, doxygen, catch, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index 4b547fde3ab..79439f82269 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, autoconf, automake, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, asciidoc, docbook_xsl, docbook_xml_dtd_45, libxslt, xmlto, pkgconfig, json_c, kmod, which, systemd, utillinux
 }:
 
 let
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index c918c61abf0..2c59fa03ea0 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPackages
-, fetchurl, autoreconfHook264, bison, binutils-unwrapped
+, autoreconfHook264, bison, binutils-unwrapped
 , libiberty, libbfd
 }:
 
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 66c7e7e882e..135f1caf97e 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchurl
 , fixedPoint ? false, withCustomModes ? true }:
 
 let
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 8da097c3d38..8dc64f2c2b5 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python2Packages, glib }:
+{ stdenv, fetchurl, pkgconfig, swig2, python2Packages, glib }:
 
 let
   inherit (python2Packages) python cython;
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 5ad9cf1e7b7..4173588ac52 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, zlib, apngSupport ? true
-, buildPlatform, hostPlatform
-}:
+{ stdenv, fetchurl, zlib, apngSupport ? true }:
 
 assert zlib != null;
 
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 02e634b22a3..0e0499251eb 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, zlib
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib
 , dbus, networkmanager, spidermonkey_38, pcre, python2, python3
 , SystemConfiguration, CoreFoundation, JavaScriptCore }:
 
diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index b7a78cb3daf..3f436677123 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, libxslt, curl }:
+{ stdenv, fetchurl, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "raptor2-2.0.15";
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index b77ba49822f..f311d1a0335 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk-doc
+{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl
 , libgcrypt, gobjectIntrospection, vala_0_38, gnome3, libintl }:
 let
   pname = "libsecret";
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index f6bfff78fa2..def5ee0e19a 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }:
+{ stdenv, fetchurl, pkgconfig, gnum4 }:
 let
   ver_maj = "2.10"; # odd major numbers are unstable
   ver_min = "0";
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 8152c1ea852..306c73a9b55 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchurl
-, buildPlatform, hostPlatform
 , enableSigbusFix ? false # required by kernels < 3.18.6
 }:
 
diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix
index 48b0ed6d711..b64c3e51778 100644
--- a/pkgs/development/libraries/libskk/default.nix
+++ b/pkgs/development/libraries/libskk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub,
+{ stdenv, fetchFromGitHub,
   libtool, gettext, pkgconfig,
   vala, gnome-common, gobjectIntrospection,
   libgee, json-glib, skk-dicts }:
diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix
index 578053bbb42..4ea2209160f 100644
--- a/pkgs/development/libraries/libsnark/default.nix
+++ b/pkgs/development/libraries/libsnark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps, fetchpatch, patchutils }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps }:
 
 let
   rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07";
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index fd58f4f44e7..b5ab9d310da 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}:
+{stdenv, fetchurl, libogg, libvorbis, pkgconfig}:
 
 stdenv.mkDerivation rec {
   name = "libtheora-1.1.1";
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index c492a15bfa4..c5a12432280 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }:
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
 
 let
   version = "4.0.9";
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index dbf1d7a3756..6a32ccf5c1b 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, xz }:
+{ stdenv, fetchurl, autoreconfHook, xz }:
 
 stdenv.mkDerivation rec {
   name = "libunwind-${version}";
diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix
index 95d4be08548..6868e5c8cfa 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/pkgs/development/libraries/libva-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
 , libdrm, libva
 }:
 
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 731892d33b4..4338a709070 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -33,7 +33,6 @@
 , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
 , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
 , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
-, experimentalSupport ? false # experimental features
 # Experimental features
 , experimentalSpatialSvcSupport ? false # Spatial scalable video coding
 , experimentalFpMbStatsSupport ? false
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index 7d4b75d6cdf..fb7f828f61f 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -35,7 +35,6 @@
 , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
 , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
 , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
-, experimentalSupport ? false # experimental features
 # Experimental features
 , experimentalSpatialSvcSupport ? false # Spatial scalable video coding
 , experimentalFpMbStatsSupport ? false
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 8a3d7abdfa5..51c142a8111 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch
+{ stdenv, lib, fetchurl
 , zlib, xz, python2, findXMLCatalogs, libiconv
 , buildPlatform, hostPlatform
 , pythonSupport ? buildPlatform == hostPlatform
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 1bb90ee195d..5b6fdb462c2 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2
+{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2
 , buildPlatform, hostPlatform
 , cryptoSupport ? false
 , pythonSupport ? buildPlatform == hostPlatform
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index ff09aeab2c6..af665c6d9a4 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "libyaml-cpp-${version}";
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index 7178e64b6b6..7bd0d1970f4 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 let
   version = "0.1.7";
 in
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix
index 3f008744c1b..5fa1035868d 100644
--- a/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/pkgs/development/libraries/linenoise-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
   name = "linenoise-ng-${version}";
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 7f4d8cc19c8..ad6d2df1d8b 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, bash, help2man, pkgconfig, xlibsWrapper, python3
+{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3
 , libxslt, systemd, libusb, libftdi1 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix
index 93c8a0474d9..c45fa6bc61a 100644
--- a/pkgs/development/libraries/lucene++/default.nix
+++ b/pkgs/development/libraries/lucene++/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, boost, gtest }:
+{ stdenv, fetchurl, cmake, boost, gtest }:
 
 stdenv.mkDerivation rec {
   name = "lucene++-${version}";
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 8b756e338e4..4b69d5d0aaf 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
+{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
 , libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp
 , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen
 , python, libXext, libmatroska, openssl, fetchpatch
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index f49b7ba2c4b..b8a8c64011c 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264
+{ stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264
 , fetchgit, cmake
 }:
 
diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix
index 0ae17b4d3f6..f18c1e693cb 100644
--- a/pkgs/development/libraries/mesa-darwin/default.nix
+++ b/pkgs/development/libraries/mesa-darwin/default.nix
@@ -1,7 +1,5 @@
-{ stdenv, stdenvAdapters, fetchurl, pkgconfig, intltool, flex, bison
-, python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau
-, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
-, enableExtraFeatures ? false # not maintained
+{ stdenv, fetchurl, pkgconfig, intltool, flex, bison
+, python, libxml2Python, expat, makedepend, xorg, llvm, libffi, libvdpau
 , OpenGL, apple_sdk, Xplugin
 }:
 
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9c0bf29d490..028930ba066 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchpatch, lib
-, pkgconfig, intltool, autoreconfHook, substituteAll
+{ stdenv, fetchurl, lib
+, pkgconfig, intltool, autoreconfHook
 , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva-minimal
 , libelf, libvdpau, valgrind-light, python2
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 2d4de339042..d8075c41a70 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, makeWrapper
+{ stdenv, fetchFromGitHub, makeWrapper
 , SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
 , libvorbis, libxml2, movit, pkgconfig, sox
 , gtk2
diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
index 444ec9dac2b..d96f90b4bfd 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/pkgs/development/libraries/mono-zeroconf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, which, pkgconfig, mono }:
+{ stdenv, fetchurl, which, pkgconfig, mono }:
 
 stdenv.mkDerivation rec {
   name = "mono-zeroconf-${version}";
diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix
index 6c5a0e5279c..b5a36c184ff 100644
--- a/pkgs/development/libraries/mpich2/default.nix
+++ b/pkgs/development/libraries/mpich2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, perl, gfortran
+{ stdenv, fetchurl, perl, gfortran
 , slurm, openssh, hwloc
 } :
 
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index b9b25e7f43b..2ecae98387e 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, m4, which, yasm }:
+{ stdenv, fetchurl, m4, which, yasm }:
 
 stdenv.mkDerivation rec {
   name = "mpir-${version}";
diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix
index e0adb312677..65679c7e282 100644
--- a/pkgs/development/libraries/neardal/default.nix
+++ b/pkgs/development/libraries/neardal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkgconfig, glib, readline, makeWrapper }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "neardal-0.7-post-git-20150930";
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 3483d4bed77..fb36839fe23 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, python }:
+{ stdenv, fetchurl, qt4, pkgconfig, libnl, python }:
 
 let
   version = "016";
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index 94aba672887..2715ff4dfaf 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, oracle-instantclient, libaio }:
+{ stdenv, fetchurl, fixDarwinDylibNames, oracle-instantclient, libaio }:
 
 stdenv.mkDerivation rec {
   name = "odpic-${version}";
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 1d3a9629fd0..264c05e1af9 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,5 +1,5 @@
 { lib, stdenv
-, fetchurl, fetchFromGitHub, fetchpatch
+, fetchurl, fetchFromGitHub
 , cmake, pkgconfig, unzip, zlib, pcre, hdf5
 , glog, boost, google-gflags, protobuf
 , config
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 60ee30177c0..293274a5776 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
+{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase }:
 
 stdenv.mkDerivation rec {
   name = "openexr-${lib.getVersion ilmbase}";
diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix
index 187f8613375..7d84392d204 100644
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/pkgs/development/libraries/openpam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, hostPlatform, fetchurl, lib }:
+{ stdenv, fetchurl, lib }:
 
 stdenv.mkDerivation rec {
   name = "openpam-${version}";
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 0251de77d03..b4b932f8d05 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, buildPackages, perl
 , buildPlatform, hostPlatform
-, fetchpatch
 , withCryptodev ? false, cryptodevHeaders
 , enableSSL2 ? false
 }:
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index 62c093f310f..b10e4713019 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU
+{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU
 , libGL, glew, ocl-icd, python3
 , cudaSupport ? false, cudatoolkit
 , darwin
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 5dc5df8e95b..e58e347c7f3 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, fetchFromGitHub, bctoolbox }:
+{ stdenv, cmake, fetchFromGitHub, bctoolbox }:
 
 stdenv.mkDerivation rec {
   baseName = "ortp";
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 9a27901c862..0dd507d6bb4 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz
+{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
 , libintl, gobjectIntrospection, darwin
 }:
 
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 73e7fd42cdb..e0819cde679 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "pcre2-${version}";
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index 9993060eb72..a8655c2dcbe 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
+{ stdenv, fetchurl, boost, fastjet, gfortran, gsl, lhapdf, thepeg, zlib, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "herwig-${version}";
diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix
index 32a05d10d3a..b287e52b243 100644
--- a/pkgs/development/libraries/physics/mcgrid/default.nix
+++ b/pkgs/development/libraries/physics/mcgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fastnlo, rivet, pkgconfig, sherpa }:
+{ stdenv, fetchurl, fastnlo, rivet, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "mcgrid-${version}";
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
index 0c9d879fbd0..2f79a2b76ab 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "nlojet++-${version}";
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index eb34b94118a..1dacdba1b1c 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }:
+{ stdenv, fetchurl, python2Packages, root, makeWrapper, zlib, withRootSupport ? false }:
 
 stdenv.mkDerivation rec {
   name = "yoda-${version}";
diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index aa9a3f9fdc0..a577d318523 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -1,12 +1,10 @@
 { fetchurl
-, fetchpatch
 , stdenv
 , perl
 , libxml2
 , postgresql
 , geos
 , proj
-, flex
 , gdal
 , json_c
 , pkgconfig
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 06154e0008b..1a20d806b96 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, version, src
+{ stdenv, version, src
 , autoreconfHook, zlib, gtest
 , ...
 }:
diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix
index 4e74e31e3ec..51253676341 100644
--- a/pkgs/development/libraries/qimageblitz/default.nix
+++ b/pkgs/development/libraries/qimageblitz/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, cmake, qt4}:
+{stdenv, fetchurl, cmake, qt4}:
 
 let
   pn = "qimageblitz";
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 4227575acb0..01d0fc510aa 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, fetchpatch, substituteAll
 , hostPlatform
-, libXrender, libXinerama, libXcursor, libXmu, libXv, libXext
+, libXrender, libXinerama, libXcursor, libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
-, libmng, which, libGLSupported, libGL, libGLU, openssl, dbus, cups, pkgconfig
+, libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig
 , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
 , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 5407a79cd77..2a706fc7b6e 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper,
+  stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
 
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index b9ed5eddd5c..8732b106134 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -26,7 +26,7 @@ existing packages here and modify it as necessary.
 
 {
   newScope,
-  stdenv, fetchurl, makeSetupHook, makeWrapper,
+  stdenv, fetchurl, makeSetupHook,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base,
 
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
index e109fe447aa..755e6a9487e 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/default.nix
@@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, makeSetupHook, makeWrapper,
+  stdenv, fetchurl, makeSetupHook,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 15e19c77567..0d9cb81afda 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -3,14 +3,14 @@
   src, patches, version, qtCompatVersion,
 
   coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
-  ruby, which,
+  which,
   # darwin support
-  darwin, libiconv, libcxx,
+  darwin, libiconv,
 
   dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite,
   libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
   libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev,
-  xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xorg,
+  xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm,
   zlib,
 
   # optional dependencies
diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
index 1b7a7c1fcea..d0bab88b2f2 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
@@ -1,6 +1,5 @@
 { qtModule, stdenv, qtbase, qtdeclarative, pkgconfig
 , alsaLib, gstreamer, gst-plugins-base, libpulseaudio
-, darwin
 }:
 
 with stdenv.lib;
diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix
index 2f8c142323d..516d38340dc 100644
--- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix
@@ -1,4 +1,4 @@
-{ qtModule, stdenv, lib, qtbase, substituteAll, systemd }:
+{ qtModule, stdenv, lib, qtbase, systemd }:
 
 let inherit (lib) getLib optional; in
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 8691e20ec45..62da679157f 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -4,7 +4,6 @@
 , sqlite, systemd, glib, gst_all_1, cmake
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
 , darwin
-, substituteAll
 , flashplayerFix ? false
 , src ? null
 , version ? null
diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix
index 49585f601d1..da56c07779b 100644
--- a/pkgs/development/libraries/qt-5/qt-env.nix
+++ b/pkgs/development/libraries/qt-5/qt-env.nix
@@ -1,4 +1,4 @@
-{ lib, buildEnv, qtbase }: name: paths:
+{ buildEnv, qtbase }: name: paths:
 
 buildEnv {
   inherit name;
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index a8611b31240..b94cdd22f7f 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, gtk2 }:
+{ stdenv, fetchFromGitHub, qmake, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "qtstyleplugins-2017-03-11";
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 8d096e18f08..ae858738ec1 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zip, zlib, qtbase, qmake }:
+{ fetchurl, stdenv, zlib, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "quazip-0.7.3";
diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix
index 77e76ad638a..35d16ee5e19 100644
--- a/pkgs/development/libraries/quickder/default.nix
+++ b/pkgs/development/libraries/quickder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, python2Packages, hexio
+{ stdenv, fetchFromGitHub, python2Packages, hexio
 , which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 90389055a41..786fce0fb63 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -5,7 +5,6 @@
 
 # Optional Arguments
 , snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null
-, numactl ? null
 
 # Malloc implementation
 , jemalloc ? null, gperftools ? null
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 77cb7cf1f2b..55c1a641fc3 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool
+{ stdenv, fetchurl, autoconf, automake, gettext, libtool
 , gfortran, openblas }:
 
 with stdenv.lib;
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index 916bf122b3c..c1994533b78 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, config, fetchFromGitHub, fetchpatch
+{ stdenv, lib, config, fetchFromGitHub
 , cmake
 , glog, google-gflags, gtest
 , protobuf, snappy
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index fc8f11f2f11..a9aa528a840 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gfortran, perl, which, config, coreutils
+{ stdenv, fetchurl, gfortran, perl, which, coreutils
 # Most packages depending on openblas expect integer width to match
 # pointer width, but some expect to use 32-bit integers always
 # (for compatibility with reference BLAS).
diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix
index 3601066cb22..632380328db 100644
--- a/pkgs/development/libraries/science/networking/ns3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns3/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchFromGitHub, fetchurl
+, fetchFromGitHub
 , python
 
 # for binding generation
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index dfaf1c679dd..f794c3841b9 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos
-, pkgconfig, gnused, expat, openldap, libiconv }:
+, pkgconfig, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "serf-1.3.9";
diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix
index 3207bdb3a7f..90043786471 100644
--- a/pkgs/development/libraries/smpeg2/default.nix
+++ b/pkgs/development/libraries/smpeg2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }:
+{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }:
 
 stdenv.mkDerivation rec {
   name = "smpeg2-svn${version}";
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index 22d66b7e71d..771ad033ed9 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gawk, alsaLib, ncurses }:
+{ stdenv, fetchurl, alsaLib, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "speech_tools-${version}.0";
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 0b815f9095f..ba3791a8a8b 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, pixman, celt, alsaLib
+{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib
 , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama
 , libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl
 , lz4 }:
diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix
index 0185bd2733b..4f711a639f7 100644
--- a/pkgs/development/libraries/tachyon/default.nix
+++ b/pkgs/development/libraries/tachyon/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , Carbon ? null
 , libjpeg ? null
 , libpng ? null
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 99f0bb65441..24251cf0cc1 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }:
+{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
   name = "libtirpc-1.0.3";
diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix
index 9f9d8e62de5..aa4a7890b23 100644
--- a/pkgs/development/libraries/unicorn-emu/default.nix
+++ b/pkgs/development/libraries/unicorn-emu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, pkgconfig, python }:
+{ stdenv, fetchurl, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
   name    = "unicorn-emulator-${version}";
diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
index 9112079a90e..ce666becc85 100644
--- a/pkgs/development/libraries/v8/3.14.nix
+++ b/pkgs/development/libraries/v8/3.14.nix
@@ -1,5 +1,5 @@
 # This old version of V8 is still needed for the R V8 module
-{ stdenv, callPackage, fetchFromGitHub, gyp, readline, python, which, icu, ... }:
+{ stdenv, fetchFromGitHub, gyp, readline, python, which, icu, ... }:
 
 assert readline != null;
 
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 438b4eda454..14211ea65e9 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, cmake, doxygen, fftw, fftwSinglePrec, hdf5, ilmbase
+{ stdenv, fetchurl, boost, cmake, fftw, fftwSinglePrec, hdf5, ilmbase
 , libjpeg, libpng, libtiff, openexr, python2Packages }:
 
 let
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 984a106236c..bdfe3d1c5c6 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, libGLU_combined, libX11, xproto, libXt
+{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xproto, libXt
 , qtLib ? null
 # Darwin support
 , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 29a27e53f22..9eb3254001d 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libiconv }:
+{ stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "wavpack-${version}";
diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix
index d832becbed8..3555a923228 100644
--- a/pkgs/development/libraries/wayland/1.9.nix
+++ b/pkgs/development/libraries/wayland/1.9.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig
-, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2
+, libffi, libxml2
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
 
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index bbc33f33e70..fce0dae6c73 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig
-, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2
+, libffi, libxml2
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
 
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
index 2b9244ff1b1..572adfeb0bb 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
 , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL
 , libX11, dbus, wayland-protocols, libdrm, mesa_noglu
 , libpthreadstubs, libXdmcp, libXext, libXfixes
diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index 17f8646b517..e343c301127 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig
-, git, xorg, gnum4, libxcb, gperf }:
+, xorg, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation rec {
   name = "xcb-util-cursor-0.1.1-3-unstable-${version}";
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 7865724efa4..63dee2529fe 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -1,5 +1,4 @@
 { stdenv, lib, fetchgit, cmake
-, avxSupport ? false
 , cudaSupport ? false, cudatoolkit
 , ncclSupport ? false, nccl
 , llvmPackages
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 274a70057bd..69b5b95e761 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, xorg, alsaLib, libGLU_combined, aalib
-, libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg
+, libvorbis, libtheora, speex, zlib, perl, ffmpeg
 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
 , libmpcdec
 }:
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index c834ab7a305..019a44482b9 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, asdf, which, bash, lisp ? null}:
+{stdenv, asdf, which, bash, lisp ? null}:
 stdenv.mkDerivation {
   name = "cl-wrapper-script";
 
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 1dc2488f55a..91493d7431e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -1,4 +1,4 @@
-{pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}:
+{pkgs, quicklisp-to-nix-packages}:
 let
   addNativeLibs = libs: x: { propagatedBuildInputs = libs; };
   skipBuildPhase = x: {
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index efa76ea00a0..b43deeceb86 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;
 
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 6765a9cc5c3..b09a483290f 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}:
+{pkgs, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}:
 
 rec {
   androidenv = pkgs.androidenv;
diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
index 5bdd0fd63c5..bbd94cb7882 100644
--- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
@@ -1,4 +1,4 @@
-{stdenv, xcodeenv, kitchensink, bundleId}:
+{xcodeenv, kitchensink, bundleId}:
 
 xcodeenv.simulateApp {
   name = "simulate-${kitchensink.name}";
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix
index 53963c100c7..26adf373826 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+{stdenv, fetchurl, unzip, makeWrapper}:
 
 stdenv.mkDerivation {
   name = "mobilesdk-6.3.1.GA";
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
index 61c23a6d0b3..a6de1f0ae8c 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+{stdenv, fetchurl, unzip, makeWrapper}:
 
 let
   # Gradle is a build system that bootstraps itself. This is what it actually
diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix
index bab2541fd74..291dd03c8d1 100644
--- a/pkgs/development/ocaml-modules/atdgen/default.nix
+++ b/pkgs/development/ocaml-modules/atdgen/default.nix
@@ -1,4 +1,4 @@
-{stdenv, atd, yojson, menhir, easy-format, biniou, cppo, buildOcaml, fetchurl, which}:
+{stdenv, atd, yojson, biniou, buildOcaml, fetchurl, which}:
 
 buildOcaml rec {
   name = "atdgen";
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 8882bbf6647..72c426ce037 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchurl, fetchpatch
 , ocaml, findlib, ocamlbuild, ocaml_oasis,
- bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp,
+ bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, frontc, ounit, ppx_jane, parsexp,
  utop,
  which, makeWrapper, writeText
 }:
diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix
index 4a2b9846271..1acb17a8f7a 100644
--- a/pkgs/development/ocaml-modules/bin_prot/default.nix
+++ b/pkgs/development/ocaml-modules/bin_prot/default.nix
@@ -1,4 +1,4 @@
-{stdenv, writeText, buildOcaml, fetchurl, type_conv}:
+{stdenv, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "bin_prot";
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 24f0e9bfd7a..962525b47e4 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
 , ppx_fields_conv, ppx_sexp_conv, ppx_deriving
-, base64, fieldslib, jsonm, logs, re, stringext, uri
+, base64, fieldslib, jsonm, re, stringext, uri
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
index 25f84826ec1..0122ec9ff61 100644
--- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
+++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
+{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
 , async ? null, lwt ? null
 }:
 
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 8b304aadd9e..f82cf33e307 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4,
-  js_of_ocaml, lwt_react, cryptokit,
+  lwt_react, cryptokit,
   ipaddr, ocamlnet, lwt_ssl, ocaml_pcre,
   opaline, ppx_tools, ppx_deriving, findlib
 , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
index a7290c8bb98..1a8f854185a 100644
--- a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
+++ b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchFromGitHub, fetchurl, ocaml, findlib, erm_xml, nocrypto }:
+{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, erm_xml, nocrypto }:
 
 buildOcaml rec {
   version = "0.3";
diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix
index 189388efe32..afeb3f1957b 100644
--- a/pkgs/development/ocaml-modules/git-unix/default.nix
+++ b/pkgs/development/ocaml-modules/git-unix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, ocaml, findlib, jbuilder, git-http
 , cohttp-lwt-unix
-, tls, magic-mime, cmdliner, mtime
+, tls, cmdliner, mtime
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index 6f0f0d0b120..0bf43174412 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
 , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri
 , alcotest, mtime, nocrypto
 }:
diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
index 4a283cc9910..19eef7cf182 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, fetchurl, async_kernel, async_unix,
+{stdenv, buildOcamlJane, async_kernel, async_unix,
  bin_prot, core, ppx_custom_printf, fieldslib, herelib,
  pipebang, sexplib, async_rpc_kernel}:
 
diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
index 4d7213a8603..938f5ccf447 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix
@@ -1,6 +1,6 @@
-{stdenv, buildOcamlJane, fetchurl, core_kernel,
+{stdenv, buildOcamlJane, core_kernel,
  bin_prot, fieldslib,
- sexplib, herelib, opam, js_build_tools, ocaml_oasis}:
+ sexplib, herelib}:
 
 buildOcamlJane rec {
   name = "async_kernel";
diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix
index 5621d2ec704..7db7cae2709 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, fetchurl, async_kernel,
+{stdenv, buildOcamlJane, async_kernel,
  bin_prot, comparelib, core, fieldslib, herelib,
  pipebang, sexplib}:
 
diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix
index 2e776e273be..4cd67e1af86 100644
--- a/pkgs/development/ocaml-modules/janestreet/async.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, fetchurl, async_kernel,
+{stdenv, buildOcamlJane, async_kernel,
  async_unix, async_extra}:
 
 buildOcamlJane rec {
diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
index bc1977ce2d6..63156215976 100644
--- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
@@ -1,5 +1,5 @@
-{ stdenv, ocaml, buildOcamlJane, fetchurl, async, comparelib, core, ctypes
-, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis, integers
+{ stdenv, buildOcamlJane, async, comparelib, core, ctypes
+, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis
 }:
 
 buildOcamlJane rec {
diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
index dc84ea34337..5410167e0a2 100644
--- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix
@@ -1,9 +1,8 @@
-{stdenv, buildOcamlJane, fetchurl,
+{stdenv, buildOcamlJane,
  core,
  bin_prot, fieldslib, sexplib, typerep, variantslib,
  ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
- re2, textutils,
- ocaml_oasis, opam, js_build_tools}:
+ re2, textutils}:
 
 buildOcamlJane rec {
   name = "core_extended";
diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix
index 05ea4d5d566..c2f97badda9 100644
--- a/pkgs/development/ocaml-modules/janestreet/core.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core.nix
@@ -1,8 +1,7 @@
-{stdenv, buildOcamlJane, fetchurl,
+{stdenv, buildOcamlJane,
  core_kernel,
  bin_prot, fieldslib, sexplib, typerep, variantslib,
- ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
- ocaml_oasis, opam, js_build_tools}:
+ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
 
 buildOcamlJane rec {
   name = "core";
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
index 93fcdde5bb3..e5bbb780052 100644
--- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix
@@ -1,7 +1,6 @@
-{stdenv, buildOcamlJane, fetchurl,
+{stdenv, buildOcamlJane,
  bin_prot, fieldslib, sexplib, typerep, variantslib,
- ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
- ocaml_oasis, opam, js_build_tools}:
+ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
 
 buildOcamlJane rec {
   name = "core_kernel";
diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index a4c3c15160d..a05d49245b2 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, janePackage, ocaml, ocamlbuild, angstrom, cryptokit, ctypes,
+{ stdenv, janePackage, ocamlbuild, angstrom, cryptokit, ctypes,
   magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re,
   zarith, num, openssl
 , ppxlib
diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix
index 5482d7ac87c..1986f7e48f6 100644
--- a/pkgs/development/ocaml-modules/mysql/default.nix
+++ b/pkgs/development/ocaml-modules/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql, openssl }:
+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, mysql }:
 
 # TODO: la versione stabile da' un errore di compilazione dovuto a
 # qualche cambiamento negli header .h
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 165dda1fa02..e1590bb0c9a 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }:
+{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, gtk2, pango }:
 
 let
   pname = "ocaml-cairo";
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 165a566b1b7..38b56ac7beb 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }:
+{ stdenv, fetchurl, ocaml, findlib, piqi, camlp4 }:
 
 stdenv.mkDerivation rec {
   version = "0.7.5";
diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index 3948cfce0e8..1f53b871282 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchFromGitHub, buildOcaml, ocaml, opaline,
- cppo, ppx_tools, ounit, ppx_deriving}:
+{stdenv, fetchFromGitHub, buildOcaml, opaline,
+ cppo, ounit, ppx_deriving}:
 
 buildOcaml rec {
   name = "ppx_import";
diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix
index 9b26c404095..2b7d9855665 100644
--- a/pkgs/development/ocaml-modules/re2/default.nix
+++ b/pkgs/development/ocaml-modules/re2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, ocaml, core_p4, pa_ounit, pa_test,
+{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test,
  bin_prot_p4, comparelib, sexplib_p4, rsync}:
 
 buildOcaml rec {
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index 1e031b135d2..181946802d7 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg
-, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit
+, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit
 , lwt     ? null}:
 
 with stdenv.lib;
diff --git a/pkgs/development/perl-modules/MNI/default.nix b/pkgs/development/perl-modules/MNI/default.nix
index 176cd06a9cc..dbb167e27b3 100644
--- a/pkgs/development/perl-modules/MNI/default.nix
+++ b/pkgs/development/perl-modules/MNI/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, buildPerlPackage, stdenv, perl }:
+{ fetchFromGitHub, buildPerlPackage, stdenv }:
 
 buildPerlPackage rec {
   name = "MNI-Perllib-2012-04-13";
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index 82b3da7a37c..b59be96bb62 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }:
+{ stdenv, fetchurl, bash, unzip, glibc, openssl, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }:
 
 { name, src, version, source-date, source-url, ... }:
 
diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix
index e8c1a948fe9..22bbb4d3be4 100644
--- a/pkgs/development/pure-modules/gen/default.nix
+++ b/pkgs/development/pure-modules/gen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl,
+{ stdenv, fetchurl,
   pkgconfig, pure, haskellPackages }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix
index e86f08b57ca..7b615928da9 100644
--- a/pkgs/development/pure-modules/glpk/default.nix
+++ b/pkgs/development/pure-modules/glpk/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl,
-  pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }:
+  pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc }:
 
 stdenv.mkDerivation rec {
   baseName = "glpk";
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 124e8b80ba0..fa07eee0d7e 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy3k
 , python
 , glibcLocales
 , pkgconfig
diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix
index 4f0a7d4aebc..550fa1da3ed 100644
--- a/pkgs/development/python-modules/GeoIP/default.nix
+++ b/pkgs/development/python-modules/GeoIP/default.nix
@@ -1,5 +1,4 @@
-{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted
-, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof
+{lib, buildPythonPackage, fetchPypi
 , geoip, nose}:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix
index 13bddd3ffb8..879cdb9bd09 100644
--- a/pkgs/development/python-modules/JPype1/default.nix
+++ b/pkgs/development/python-modules/JPype1/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+{ buildPythonPackage, fetchPypi, isPy3k }:
 
 buildPythonPackage rec {
   pname = "JPype1";
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix
index 29a792000e9..48878995bb4 100644
--- a/pkgs/development/python-modules/PyLD/default.nix
+++ b/pkgs/development/python-modules/PyLD/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, python, gnugrep }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, gnugrep }:
 
 let
 
diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index 30c820ec6c1..e2b31cdda79 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -9,7 +9,6 @@
 , isPy3k
 , nose
 , numpy
-, pydot_ng
 , scipy
 , six
 , libgpuarray
diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix
index cd81a7facc2..820ee2a95d8 100644
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage
 , certbot
 , nose
 , cryptography
diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index f0756e1572e..9f307f24dfa 100644
--- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:
+{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:
 
 buildPythonPackage rec {
   pname = "aiohttp-jinja2";
diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix
index 3065bb17c05..00198cd27cf 100644
--- a/pkgs/development/python-modules/aiohttp/cors.nix
+++ b/pkgs/development/python-modules/aiohttp/cors.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
 , typing, aiohttp
 }:
 
diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
index 2ad260f5d40..1492a15aadf 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }:
+{ lib, buildPythonPackage, fetchPypi, aiohttp }:
 
 buildPythonPackage rec {
   pname = "aiohue";
diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix
index ba32cf7ea69..6db4bbdc314 100644
--- a/pkgs/development/python-modules/anyjson/default.nix
+++ b/pkgs/development/python-modules/anyjson/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, nose }:
+{ buildPythonPackage, fetchPypi, isPy3k, nose }:
 
 buildPythonPackage rec {
   pname = "anyjson";
diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix
index 32314b81edc..584eb3ae2c5 100644
--- a/pkgs/development/python-modules/application/default.nix
+++ b/pkgs/development/python-modules/application/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
+{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
 
 buildPythonPackage rec {
   pname = "python-application";
diff --git a/pkgs/development/python-modules/area53/default.nix b/pkgs/development/python-modules/area53/default.nix
index 808ddc57096..20013b8a1ed 100644
--- a/pkgs/development/python-modules/area53/default.nix
+++ b/pkgs/development/python-modules/area53/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , boto }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index 28b88d3b46a..37d97f42aa1 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, fetchPypi, lib,
-  coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt
+  dicttoxml, pexpect, prettytable, requests_toolbelt
 }:
 buildPythonPackage rec {
   pname = "argcomplete";
diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix
index f46efd9f496..ce371076256 100644
--- a/pkgs/development/python-modules/argon2_cffi/default.nix
+++ b/pkgs/development/python-modules/argon2_cffi/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, cffi
+{ cffi
 , six
 , hypothesis
 , pytest
diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index fd89457ed31..2fbe4932bed 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, pytest, requests, requests_oauthlib, six
+{ buildPythonPackage, pytest, requests, requests_oauthlib, six
 , fetchFromGitHub, responses, stdenv
 }:
 
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index bc8e375271d..ee15be95418 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -1,7 +1,6 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, pytestrunner
 , pythonOlder
 }:
 
diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix
index c3ed7bed742..489a31b3242 100644
--- a/pkgs/development/python-modules/asyncio/default.nix
+++ b/pkgs/development/python-modules/asyncio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy33, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "asyncio";
diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix
index 0004badd6f4..187e0924cca 100644
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/pkgs/development/python-modules/asynctest/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, pythonOlder, python }:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, python }:
 
 buildPythonPackage rec {
   pname = "asynctest";
diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix
index 1c3c1fdefbe..bf7c35fa698 100644
--- a/pkgs/development/python-modules/autograd/default.nix
+++ b/pkgs/development/python-modules/autograd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, future, nose }:
+{ stdenv, buildPythonPackage, fetchPypi, numpy, future }:
 
 buildPythonPackage rec {
   pname = "autograd";
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index a4a7b63b8a3..6fc3f16b3ad 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchPypi
-, buildPythonApplication, isPy27, python, pythonOlder
+, buildPythonApplication, python, pythonOlder
 , mock, nose, pathpy, pyhamcrest, pytest
 , glibcLocales, parse, parse-type, six
 , traceback2
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 240dd5513e8..2a9cb2a2cfd 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, fetchPypi, fetchurl, makeWrapper, unzip }:
+{ stdenv, python, fetchPypi, makeWrapper, unzip }:
 
 let
   wheel_source = fetchPypi {
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index 791b05e81ca..c9ca8f7ec04 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , nose
 , numpy
diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix
index 5a9bae58bd6..b5da73a32d2 100644
--- a/pkgs/development/python-modules/browsermob-proxy/default.nix
+++ b/pkgs/development/python-modules/browsermob-proxy/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , requests
diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix
index 3bc9882585f..8efb1c083f2 100644
--- a/pkgs/development/python-modules/bz2file/default.nix
+++ b/pkgs/development/python-modules/bz2file/default.nix
@@ -1,6 +1,5 @@
 { lib
 , buildPythonPackage
-, isPy3k
 , fetchPypi
 }:
 
diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix
index de15ffaabc6..d4b9195c555 100644
--- a/pkgs/development/python-modules/cachetools/default.nix
+++ b/pkgs/development/python-modules/cachetools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "cachetools";
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index 395122b4da9..f85f80ea239 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , pyserial
diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix
index 99ac6c3ec45..3e07188986d 100644
--- a/pkgs/development/python-modules/canmatrix/default.nix
+++ b/pkgs/development/python-modules/canmatrix/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , python
diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix
index 08ae54e0b73..1afe2341633 100644
--- a/pkgs/development/python-modules/canopen/default.nix
+++ b/pkgs/development/python-modules/canopen/default.nix
@@ -1,7 +1,5 @@
 { lib
-, stdenv
 , buildPythonPackage
-, fetchPypi
 , fetchFromGitHub
 , nose
 , can
diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix
index 2c0b0e623ca..0c636e12088 100644
--- a/pkgs/development/python-modules/cdecimal/default.nix
+++ b/pkgs/development/python-modules/cdecimal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, wget, buildPythonPackage, isPy3k }:
+{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
 
 with stdenv.lib;
 
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 72476942276..3f1456f6e94 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }:
+{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
index 0e355723604..425a53987ca 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , pytest
 , coveralls
diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix
index b07a205ba21..cc75649119b 100644
--- a/pkgs/development/python-modules/chainer/default.nix
+++ b/pkgs/development/python-modules/chainer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, python
+{ stdenv, lib
 , buildPythonPackage, fetchPypi, isPy3k
 , filelock, protobuf, numpy, pytest, mock
 , cupy, cudaSupport ? false
diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix
index f004e6d541c..1c42b1283ee 100644
--- a/pkgs/development/python-modules/characteristic/default.nix
+++ b/pkgs/development/python-modules/characteristic/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , pytest
 }:
diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix
index 7e6cc206cdc..0a82238b703 100644
--- a/pkgs/development/python-modules/circus/default.nix
+++ b/pkgs/development/python-modules/circus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , iowait, psutil, pyzmq, tornado, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index e83fd4163e4..967941666c8 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k
 , pyperclip, six, pyparsing, vim, wcwidth, colorama
-, contextlib2 ? null, subprocess32 ? null
-, pytest, mock, which, fetchFromGitHub, glibcLocales
+, contextlib2 ? null
+, pytest, mock, which, glibcLocales
 }:
 buildPythonPackage rec {
   pname = "cmd2";
diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix
index 5ffa51def0d..7778e73f92f 100644
--- a/pkgs/development/python-modules/cmd2/old.nix
+++ b/pkgs/development/python-modules/cmd2/old.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, pythonOlder
+{ stdenv, buildPythonPackage, pythonOlder
 , pyperclip, six, pyparsing, vim
 , contextlib2 ? null, subprocess32 ? null
 , pytest, mock, which, fetchFromGitHub, glibcLocales
diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix
index cfd6389ce5f..bcf32714796 100644
--- a/pkgs/development/python-modules/coinmarketcap/default.nix
+++ b/pkgs/development/python-modules/coinmarketcap/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }:
+{ lib, buildPythonPackage, fetchPypi, requests-cache }:
 
 buildPythonPackage rec {
   pname = "coinmarketcap";
diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix
index 1ccb31d5120..14bae27592a 100644
--- a/pkgs/development/python-modules/colorlover/default.nix
+++ b/pkgs/development/python-modules/colorlover/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, python, stdenv, nose
+{ buildPythonPackage, fetchPypi, stdenv
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix
index 6a52076252e..62e63a8e5b3 100644
--- a/pkgs/development/python-modules/configargparse/default.nix
+++ b/pkgs/development/python-modules/configargparse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ConfigArgParse";
diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix
index 8e770c504c3..7bef3e82935 100644
--- a/pkgs/development/python-modules/configparser/default.nix
+++ b/pkgs/development/python-modules/configparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "configparser";
diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index afba2e17bf6..680f6e02cd0 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }:
 
 buildPythonPackage rec {
   pname = "construct";
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 4d2a168f79c..0aa38aed296 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, isPy3k
 , mock
 }:
 
diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix
index 232a4a19fd8..f27cfc44e57 100644
--- a/pkgs/development/python-modules/cram/default.nix
+++ b/pkgs/development/python-modules/cram/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, buildPythonPackage, fetchPypi, bash, which, writeText}:
+{stdenv, lib, buildPythonPackage, fetchPypi, bash, which}:
 
 buildPythonPackage rec {
   version = "0.7";
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index e19850be8ce..db48326535d 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils, nose }:
+{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }:
 
 buildPythonPackage rec {
   pname = "credstash";
diff --git a/pkgs/development/python-modules/cryptography_vectors/default.nix b/pkgs/development/python-modules/cryptography_vectors/default.nix
index bcab5c43475..6285ac28fce 100644
--- a/pkgs/development/python-modules/cryptography_vectors/default.nix
+++ b/pkgs/development/python-modules/cryptography_vectors/default.nix
@@ -1,6 +1,5 @@
 { buildPythonPackage
 , fetchPypi
-, cryptography
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 3a3aeb7b226..da742b31050 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, buildPythonPackage
+{ stdenv, buildPythonPackage
 , fetchPypi, isPy3k, linuxPackages, gcc5
 , fastrlock, numpy, six, wheel, pytest, mock
 , cudatoolkit, cudnn, nccl
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix
index 69a5e8c11d4..67120bf0f3d 100644
--- a/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/pkgs/development/python-modules/cx_freeze/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy35, ncurses }:
+{ stdenv, buildPythonPackage, fetchPypi, ncurses }:
 
 buildPythonPackage rec {
   pname = "cx_Freeze";
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index d01029652a9..47c206fda5e 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+{ lib, buildPythonPackage, fetchFromGitHub
 , decorator, requests, simplejson
 , nose, mock }:
 
diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix
index fdc408e1c4c..f6af0855b9f 100644
--- a/pkgs/development/python-modules/dateparser/default.nix
+++ b/pkgs/development/python-modules/dateparser/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, isPy3k
+{ lib, fetchPypi, buildPythonPackage
 , nose
 , parameterized
 , mock
diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix
index 937b6df4229..e4cd21bce4a 100644
--- a/pkgs/development/python-modules/debian/default.nix
+++ b/pkgs/development/python-modules/debian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , chardet, six}:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix
index 6426333ed26..32819536500 100644
--- a/pkgs/development/python-modules/defusedxml/default.nix
+++ b/pkgs/development/python-modules/defusedxml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "defusedxml";
diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix
index 6b048db90e3..fa06117a644 100644
--- a/pkgs/development/python-modules/django_tagging/default.nix
+++ b/pkgs/development/python-modules/django_tagging/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, django }:
+{ buildPythonPackage, fetchPypi, django }:
 
 buildPythonPackage rec {
   pname = "django-tagging";
diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix
index dabc3244592..7ce8877bbce 100644
--- a/pkgs/development/python-modules/dkimpy/default.nix
+++ b/pkgs/development/python-modules/dkimpy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, openssl, makeWrapper, buildPythonPackage
+{ stdenv, fetchPypi, openssl, buildPythonPackage
 , pytest, dnspython, pynacl, authres, python }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix
index 27b1a3e6122..20f4bc7e0c3 100644
--- a/pkgs/development/python-modules/dugong/default.nix
+++ b/pkgs/development/python-modules/dugong/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }:
+{ buildPythonPackage, fetchPypi, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "dugong";
diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index 334778c93aa..97f04828300 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi
-, pycrypto, pillow, protobuf, future, ecpy
+, pycrypto, pillow, protobuf, future
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix
index a0a619a39c8..99859ac1517 100644
--- a/pkgs/development/python-modules/email-validator/default.nix
+++ b/pkgs/development/python-modules/email-validator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }:
 
 buildPythonPackage rec {
   pname = "email_validator";
diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix
index a05ac1ba679..c4d600ec994 100644
--- a/pkgs/development/python-modules/faulthandler/default.nix
+++ b/pkgs/development/python-modules/faulthandler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, fetchpatch }:
+{ stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "faulthandler";
diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix
index c5ac67106a2..67ff86e8f72 100644
--- a/pkgs/development/python-modules/feedgen/default.nix
+++ b/pkgs/development/python-modules/feedgen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }:
+{ stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }:
 
 buildPythonPackage rec {
   pname = "feedgen";
diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
index 2612cfde1f5..eaed804245f 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -1,5 +1,4 @@
-{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six,
-  fetchurl }:
+{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }:
 
 buildPythonPackage rec {
   pname = "flake8-future-import";
diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
index f4fc3cf3fa2..89cbdf0fbf8 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic
-}:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }:
 
 with stdenv.lib;
 
diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix
index 17b9d018c39..d9a0682a02e 100644
--- a/pkgs/development/python-modules/flit/default.nix
+++ b/pkgs/development/python-modules/flit/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, fetchurl
 , isPy3k
 , docutils
 , requests
diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix
index c09d54ad555..a528244cb0f 100644
--- a/pkgs/development/python-modules/fpdf/default.nix
+++ b/pkgs/development/python-modules/fpdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "fpdf";
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index ca1c9a09e4e..d2e806e43b9 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -4,8 +4,6 @@
 , html5lib
 , wcwidth
 , nose
-, python
-, isPy3k
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 3faa6d914d2..1b3ab52c4c3 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -5,9 +5,6 @@
 , six
 , scipy
 , smart_open
-, scikitlearn
-, testfixtures
-, unittest2
 }:
 
 buildPythonPackage rec {
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 7f2c7a58229..aa8050de088 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
-pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
+pkgconfig, boost, expat, scipy, cgal, gmp, mpfr,
 gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses,
 buildPythonPackage }:
 
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 144e826b675..2b95b1473cb 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch, isPy27, python, buildPythonPackage
+{ stdenv, fetchPypi, isPy27, python, buildPythonPackage
 , numpy, hdf5, cython, six, pkgconfig, unittest2
 , mpi4py ? null, openssh }:
 
diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix
index bbd4760bdf8..5131e64a3c2 100644
--- a/pkgs/development/python-modules/hupper/default.nix
+++ b/pkgs/development/python-modules/hupper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python
+{ stdenv, buildPythonPackage, fetchPypi
 , pytest, pytestcov, watchdog, mock
 }:
 
diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix
index b7254461183..8337fd2230b 100644
--- a/pkgs/development/python-modules/hypchat/default.nix
+++ b/pkgs/development/python-modules/hypchat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , requests, six, dateutil }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index d5ee59ac2d9..88705962627 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python
+{ lib, buildPythonPackage, fetchFromGitHub
 , isPy3k, attrs, coverage, enum34
-, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock
+, doCheck ? true, pytest, pytest_xdist, flaky, mock
 }:
 buildPythonPackage rec {
   # http://hypothesis.readthedocs.org/en/latest/packaging.html
diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix
index 25c3c901a4e..49d1062abc3 100644
--- a/pkgs/development/python-modules/image-match/default.nix
+++ b/pkgs/development/python-modules/image-match/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, dask, scikitimage, six }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }:
 
 buildPythonPackage {
   pname = "image-match";
diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix
index ef2444c0d2f..c67d56b153e 100644
--- a/pkgs/development/python-modules/iowait/default.nix
+++ b/pkgs/development/python-modules/iowait/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "iowait";
diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix
index a91988bd97d..f2066fee2a4 100644
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/pkgs/development/python-modules/ipython/5.nix
@@ -2,7 +2,6 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
-, pythonOlder
 # Build dependencies
 , glibcLocales
 # Test dependencies
@@ -13,7 +12,6 @@
 , mock
 # Runtime dependencies
 , backports_shutil_get_terminal_size
-, jedi
 , decorator
 , pathlib2
 , pickleshare
diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 65d1f4f6822..17896a58469 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -1,11 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, nose
 , sphinx
 , numpydoc
-, isPy3k
-, stdenv
 , pytest
 }:
 
diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix
index 3a6d69cc829..f11fccb086b 100644
--- a/pkgs/development/python-modules/jsmin/default.nix
+++ b/pkgs/development/python-modules/jsmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "jsmin";
diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix
index c934d24dab7..a6a955507a7 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter_core/default.nix
@@ -1,5 +1,4 @@
 { lib
-, python
 , buildPythonPackage
 , fetchPypi
 , ipython
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index dbd2e36b7b8..8598654e206 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -1,5 +1,4 @@
 { lib
-, python
 , buildPythonPackage
 , fetchPypi
 , fetchzip
@@ -13,7 +12,6 @@
 , traitlets
 , requests
 , pythonOlder
-, nodejs-8_x
 , nodePackages
 }:
 
diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix
index 19169e88b12..a1e795421b0 100644
--- a/pkgs/development/python-modules/kaitaistruct/default.nix
+++ b/pkgs/development/python-modules/kaitaistruct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "kaitaistruct";
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index be59a112be7..3b221238f3a 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi
 , pytest, pytestcov, pytestpep8, pytest_xdist
 , six, numpy, scipy, pyyaml, h5py
 }:
diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix
index 95672600a30..17a6b158d3f 100644
--- a/pkgs/development/python-modules/ldap/default.nix
+++ b/pkgs/development/python-modules/ldap/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , pyasn1, pyasn1-modules, pytest
 , openldap, cyrus_sasl }:
 
diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index 58ca72a3dc9..02d10b832ff 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi
 , pbr, ldap, fixtures, testresources, testtools }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index 2fc66e810d0..fc58c6ca6a1 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub
-, python, cmake, sip, protobuf, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, cmake, sip, protobuf, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "libarcus";
diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 14e83584678..ef01fde2daa 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -8,7 +8,6 @@
 , six
 , nose
 , Mako
-, python
 , cudaSupport ? false, cudatoolkit , nvidia_x11
 , openclSupport ? true, ocl-icd, clblas
 }:
diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix
index cf0a1a865a1..75e55944e98 100644
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, pkgconfig, libversion, pythonOlder }:
+{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "libversion";
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index a99d4542ba5..26b42020fc3 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }:
+{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }:
 
 buildPythonPackage rec {
   pname = "libvirt";
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index ad6b938c988..4689050ba6c 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -1,7 +1,6 @@
 { stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  isPy3k,
   pythonOlder,
   lib,
   requests,
diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix
index c9b9b489613..bc91139728b 100644
--- a/pkgs/development/python-modules/lmtpd/default.nix
+++ b/pkgs/development/python-modules/lmtpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }:
+{ stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "lmtpd";
diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix
index 4a96ce8ad05..ff1a6e49b01 100644
--- a/pkgs/development/python-modules/marionette-harness/default.nix
+++ b/pkgs/development/python-modules/marionette-harness/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
index 5d52b52ac7f..7316526aa28 100644
--- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix
+++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
index d27637874af..b6d761f077c 100644
--- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
+++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
index ccd0eb6cc9f..3f7710acb3c 100644
--- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozfile
diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
index 8569d9287ac..491069cd87f 100644
--- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , moznetwork
diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix
index 7bd14f2d10c..34350dd4821 100644
--- a/pkgs/development/python-modules/marionette-harness/mozfile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
index 1d1be733f99..6862967e420 100644
--- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , moznetwork
diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
index dfe91309ea4..bc4b9e91465 100644
--- a/pkgs/development/python-modules/marionette-harness/mozlog.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
index a6561d3e07a..3901f7c310d 100644
--- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix
+++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozlog
diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
index c1e53443260..e8130e8038f 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozinfo
diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
index c94acdd3ba5..3620248904c 100644
--- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozlog
diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
index e9f6177cfa1..324c7c6c2d2 100644
--- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozdevice
diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix
index d1c799c95de..2ff50e1fa92 100644
--- a/pkgs/development/python-modules/marionette-harness/moztest.nix
+++ b/pkgs/development/python-modules/marionette-harness/moztest.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozinfo
diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix
index c9eb12bd52b..dbe3cb4bc2d 100644
--- a/pkgs/development/python-modules/marionette-harness/mozversion.nix
+++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , mozlog
diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index e4b2bdefad2..cfb70724210 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask
+{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask
 , requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses
 , six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }:
 
diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix
index 3f974872b95..6dbfa1fae60 100644
--- a/pkgs/development/python-modules/mrbob/default.nix
+++ b/pkgs/development/python-modules/mrbob/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, stdenv, glibcLocales, mock, nose, isPy3k, argparse, jinja2, six
-, fetchPypi, lib
+, fetchPypi
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix
index f689bc2ff49..a3a9096a335 100644
--- a/pkgs/development/python-modules/murmurhash/default.nix
+++ b/pkgs/development/python-modules/murmurhash/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchPypi
 , cython
-, python
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index dfa87c843ff..b167b7f427c 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -13,7 +13,6 @@
 , testpath
 , jupyter_core
 , nbformat
-, nbconvert
 , ipykernel
 , pandocfilters
 , tornado
diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 4cc5769d8d8..27fc7d11e75 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -5,7 +5,6 @@
 , lxml
 , libxml2
 , libxslt
-, pytest
 , nose
 , rednose
 }:
diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix
index af7e4dde59e..e60233c3590 100644
--- a/pkgs/development/python-modules/netdisco/default.nix
+++ b/pkgs/development/python-modules/netdisco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, requests, zeroconf, netifaces, pytest }:
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }:
 
 buildPythonPackage rec {
   pname = "netdisco";
diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix
index 9645e54f7ec..56edc44bce7 100644
--- a/pkgs/development/python-modules/nltk/default.nix
+++ b/pkgs/development/python-modules/nltk/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }:
+{ fetchurl, buildPythonPackage, lib, six, pythonAtLeast, pythonOlder }:
 
 buildPythonPackage rec {
   version = "3.2.5";
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index d6531eda2ef..d9e884dabbe 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchPypi, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas, hostPlatform }:
+{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, blas, hostPlatform }:
 
 buildPythonPackage rec {
   pname = "numpy";
diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix
index 3f37940ed8a..474609220cf 100644
--- a/pkgs/development/python-modules/ovh/default.nix
+++ b/pkgs/development/python-modules/ovh/default.nix
@@ -1,9 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, requests
-, nose
-, mock
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix
index 2c0a2c44f6e..e4973d0d6e3 100644
--- a/pkgs/development/python-modules/pandas/0.17.1.nix
+++ b/pkgs/development/python-modules/pandas/0.17.1.nix
@@ -1,8 +1,6 @@
 { buildPythonPackage
 , fetchPypi
-, python
 , stdenv
-, fetchurl
 , pytest
 , glibcLocales
 , cython
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 08fdddb7346..fc75e5803af 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -2,7 +2,6 @@
 , fetchPypi
 , python
 , stdenv
-, fetchurl
 , pytest
 , glibcLocales
 , cython
diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix
index ac150af4b78..34573626bac 100644
--- a/pkgs/development/python-modules/parse-type/default.nix
+++ b/pkgs/development/python-modules/parse-type/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch
+{ stdenv, fetchPypi
 , buildPythonPackage, pythonOlder
 , pytest, pytestrunner
 , parse, six, enum34
diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix
index 18cc23338bf..4092f5e1c4f 100644
--- a/pkgs/development/python-modules/parse/default.nix
+++ b/pkgs/development/python-modules/parse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, fetchpatch
+{ stdenv, fetchPypi
 , buildPythonPackage, python
 }:
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index 165de7bd2ba..24539c7bbce 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , nose
 , bcrypt
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
index 2d1f707a8eb..1ee93c753d8 100644
--- a/pkgs/development/python-modules/pelican/default.nix
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
-, glibcLocales, pandoc, git
+, glibcLocales, git
 , mock, nose, markdown, lxml, typogrify
 , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator
 , blinker, pillow, beautifulsoup4, markupsafe }:
diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index b861797c4a8..4f2e7f3ca84 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -1,7 +1,6 @@
 { buildPythonPackage
 , fetchPypi
 , zope_interface
-, pkgs
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
index 3f90e6b2da7..5675be32397 100644
--- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix
+++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, python
+{ buildPythonPackage, fetchPypi
 , plaster, PasteDeploy
 , pytest, pytestcov
 }:
diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix
index 8c3de8bd035..82aaebb1003 100644
--- a/pkgs/development/python-modules/plaster/default.nix
+++ b/pkgs/development/python-modules/plaster/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, python
+{ buildPythonPackage, fetchPypi
 , pytest, pytestcov
 }:
 
diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix
index 0fbfa5108c1..2a6996c628e 100644
--- a/pkgs/development/python-modules/pluggy/default.nix
+++ b/pkgs/development/python-modules/pluggy/default.nix
@@ -1,7 +1,6 @@
 { buildPythonPackage
 , lib
 , fetchPypi
-, pytest
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index 5269ecd5d8b..2c6eb7e5fbf 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , pytest
 }:
diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix
index 0ae689034a3..2b00a007f90 100644
--- a/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/pkgs/development/python-modules/poppler-qt5/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, fetchPypi, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch
-, python, substituteAll
+, substituteAll
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
index f51c6989c01..841e003bc89 100644
--- a/pkgs/development/python-modules/powerline/default.nix
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -1,9 +1,6 @@
 { lib
 , fetchurl
 , buildPythonPackage
-, git
-, mercurial
-, bazaar
 , psutil
 , pygit2
 }:
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index 212c06cc942..18fb14c3aa9 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -2,7 +2,6 @@
 , python
 , buildPythonPackage
 , fetchFromGitHub
-, isPy3k
 , pytest
 , python-utils
 , sphinx
diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix
index eaf353af082..f6b2bfa939c 100644
--- a/pkgs/development/python-modules/prometheus_client/default.nix
+++ b/pkgs/development/python-modules/prometheus_client/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "prometheus_client";
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 7fbdfb7c33e..84fe2f69554 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , fetchPypi
 , darwin
-, mock
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix
index 6adc1e7ec04..be409e348ea 100644
--- a/pkgs/development/python-modules/pyGithub/default.nix
+++ b/pkgs/development/python-modules/pyGithub/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchFromGitHub
-, cacert
 , buildPythonPackage, python-jose, pyjwt }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix
index 5fd1be7c15c..fd1866d22f4 100644
--- a/pkgs/development/python-modules/pyaml/default.nix
+++ b/pkgs/development/python-modules/pyaml/default.nix
@@ -3,7 +3,6 @@
 , fetchPypi
 , pyyaml
 , unidecode
-, python
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index 845630e514f..d4ed6088409 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -1,5 +1,5 @@
 { lib, fetchpatch
-, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
+, buildPythonPackage, fetchPypi, isPy3k
 , beautifulsoup4, lxml, cssutils, future, enum34, six
 }:
 
diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
index b074f9f4934..23ed4917cc5 100644
--- a/pkgs/development/python-modules/pycollada/default.nix
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil }:
+{ stdenv, fetchPypi, buildPythonPackage, numpy, dateutil }:
 
 buildPythonPackage rec {
   pname = "pycollada";
diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index af975e333f0..e7858888d36 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, pycryptodome }:
+{ buildPythonPackage, pycryptodome }:
 
 # This is a dummy package providing the drop-in replacement pycryptodome.
 # https://github.com/NixOS/nixpkgs/issues/21671
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index b4ef42cb22a..35041f8447b 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, python, buildPythonPackage, gmp }:
+{ stdenv, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   version = "3.6.2";
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 5a4a81f13ac..b6c9ae5e8ba 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11
+{ stdenv, lib, fetchurl, buildPythonPackage, python, libX11
 , SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype
 }:
 
diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix
index 08c266da696..916bf7f692d 100644
--- a/pkgs/development/python-modules/pygame_sdl2/default.nix
+++ b/pkgs/development/python-modules/pygame_sdl2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy27, fetchpatch
+{ stdenv, buildPythonPackage, fetchurl, isPy27, fetchpatch
 , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix
index 5271677dc1e..d4c46d6b835 100644
--- a/pkgs/development/python-modules/pygccxml/default.nix
+++ b/pkgs/development/python-modules/pygccxml/default.nix
@@ -1,5 +1,5 @@
 { stdenv, castxml, fetchFromGitHub, buildPythonPackage,
-llvmPackages, clang }:
+llvmPackages }:
 buildPythonPackage rec {
   pname = "pygccxml";
   version = "1.9.1";
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 524fb4af61c..c6264f08de8 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
+{ stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
 
 buildPythonPackage rec {
   major = "3.26";
diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix
index a0dd6113b75..5af6ef99228 100644
--- a/pkgs/development/python-modules/pymc3/default.nix
+++ b/pkgs/development/python-modules/pymc3/default.nix
@@ -12,7 +12,6 @@
 , pytest
 , nose
 , parameterized
-, matplotlib
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix
index 1263c498a46..3b7011fa748 100644
--- a/pkgs/development/python-modules/pymvglive/default.nix
+++ b/pkgs/development/python-modules/pymvglive/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "PyMVGLive";
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index bceb2b50cc5..463cd8044e1 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium, cffi, six, hypothesis}:
 
 buildPythonPackage rec {
   pname = "pynacl";
diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix
index 08fc8712795..09b7f386130 100644
--- a/pkgs/development/python-modules/pyogg/default.nix
+++ b/pkgs/development/python-modules/pyogg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, libvorbis, flac, libogg, libopus, opusfile }:
+{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile }:
 
 buildPythonPackage rec {
     pname = "PyOgg";
diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
index 8175ef2b172..55f96416efd 100644
--- a/pkgs/development/python-modules/pyowm/default.nix
+++ b/pkgs/development/python-modules/pyowm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "pyowm";
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index ebad81f809b..6a3e3e66e2c 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper
+{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig
 , qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus
 , withWebSockets ? false, qtwebsockets
 , withConnectivity ? false, qtconnectivity
diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix
index 89799988fa1..280981ab2c2 100644
--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/pkgs/development/python-modules/pysc2/default.nix
@@ -4,7 +4,6 @@
 , absl-py
 , enum34
 , future
-, futures
 , mock
 , mpyq
 , numpy
diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
index 6681b1b199a..1ffc546cfa1 100644
--- a/pkgs/development/python-modules/pysdl2/default.nix
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, pyopengl }:
+{ stdenv, lib, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }:
 
 buildPythonPackage rec {
   pname = "PySDL2";
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 288b141d32e..ab46c726f6c 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:
+{ lib, fetchurl, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }:
 
 # This derivation provides a Python module and should therefore be called via `python-packages.nix`.
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix
index 4555479af43..3ca4f832c8c 100644
--- a/pkgs/development/python-modules/pytest-cram/default.nix
+++ b/pkgs/development/python-modules/pytest-cram/default.nix
@@ -1,4 +1,4 @@
-{lib, buildPythonPackage, fetchPypi, pytest, cram, bash, writeText}:
+{lib, buildPythonPackage, fetchPypi, pytest, cram, bash}:
 
 buildPythonPackage rec {
   version = "0.2.0";
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index c2d205f2833..101594750fd 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -1,4 +1,4 @@
-{lib, buildPythonPackage, fetchPypi, fetchpatch, pytest, flake8}:
+{lib, buildPythonPackage, fetchPypi, pytest, flake8}:
 
 buildPythonPackage rec {
   pname = "pytest-flake8";
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index c12d4b8add0..163063ae57f 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "pytest-mock";
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 38d34a95854..84f337e1b83 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:
+{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked }:
 
 buildPythonPackage rec {
   pname = "pytest-xdist";
diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix
index f4d87dc035c..e8c71bff18b 100644
--- a/pkgs/development/python-modules/python-oauth2/default.nix
+++ b/pkgs/development/python-modules/python-oauth2/default.nix
@@ -1,5 +1,4 @@
 { lib
-, python
 , buildPythonPackage
 , fetchPypi
 }:
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 18162d105ac..962ebbecbaa 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage, pythonOlder,
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
-  fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, typing, cmake,
-  stdenv, linkFarm, symlinkJoin,
+  fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake,
+  linkFarm, symlinkJoin,
   utillinux, which }:
 
 assert cudnn == null || cudatoolkit != null;
diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix
index d09a9bbd6d8..159e0ce15fb 100644
--- a/pkgs/development/python-modules/pywbem/default.nix
+++ b/pkgs/development/python-modules/pywbem/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, libxml2
+{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
 , m2crypto, ply, pyyaml, six
 , httpretty, lxml, mock, pytest, requests
 }:
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
index 646308feece..5a55c1f47bb 100644
--- a/pkgs/development/python-modules/pyxml/default.nix
+++ b/pkgs/development/python-modules/pyxml/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchurl, python, buildPythonPackage, makeWrapper}:
+{fetchurl, python, buildPythonPackage, makeWrapper}:
 
 buildPythonPackage rec {
   pname = "PyXML";
diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix
index 26107ea3c4a..4de7777fa8b 100644
--- a/pkgs/development/python-modules/pyzmq/default.nix
+++ b/pkgs/development/python-modules/pyzmq/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , pytest
 , tornado
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 1eda590a864..dae43aa0462 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -2,8 +2,6 @@
 , isPy3k
 , buildPythonPackage
 , fetchPypi
-, fetchurl
-, python
 , numpy
 , scipy
 , sympy
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index cdbba180673..badaf9b3787 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , isodate
 , html5lib
diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix
index de2683595e5..6ea233f695b 100644
--- a/pkgs/development/python-modules/redis/default.nix
+++ b/pkgs/development/python-modules/redis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ fetchPypi, buildPythonPackage }:
 buildPythonPackage rec {
   pname = "redis";
   version = "2.10.6";
diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index a356db74f07..0b3e84c3512 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -1,9 +1,7 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , freetype
 , pillow
-, pip
 , glibcLocales
 , python
 , isPyPy
diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix
index 6bd294671de..2286d9c2dc7 100644
--- a/pkgs/development/python-modules/requests-mock/default.nix
+++ b/pkgs/development/python-modules/requests-mock/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, python
+{ buildPythonPackage, fetchPypi, python
 , mock, testrepository, testtools
 , requests, six }:
 
diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix
index 4cc74431fc8..662045a9ce1 100644
--- a/pkgs/development/python-modules/responses/default.nix
+++ b/pkgs/development/python-modules/responses/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , cookies, mock, requests, six }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index d9c87918176..ed0bf42ae68 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}:
+{buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}:
 
 buildPythonPackage rec {
   pname = "rhpl";
diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix
index 7184795639c..d8c43c1ea86 100644
--- a/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/pkgs/development/python-modules/rubymarshal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, hypothesis }:
+{ stdenv, buildPythonPackage, fetchPypi, hypothesis }:
 
 buildPythonPackage rec {
   pname = "rubymarshal";
diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index ed358213492..c642039d4fe 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython
+{ stdenv, buildPythonPackage, fetchPypi, nose, dnspython
 ,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix
index 6ac3ab5ddb9..1a07e001cae 100644
--- a/pkgs/development/python-modules/scikit-image/default.nix
+++ b/pkgs/development/python-modules/scikit-image/default.nix
@@ -11,7 +11,6 @@
 , pywavelets
 , dask
 , cloudpickle
-, nose
 , pytest
 }:
 
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index edaf7cd90cc..39af29da814 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, python
+{ stdenv, buildPythonPackage, fetchPypi, python
 , nose, pillow
 , gfortran, glibcLocales
 , numpy, scipy
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 5e57dd3f093..41878b19d08 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, nose, pytest, numpy}:
+{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}:
 
 buildPythonPackage rec {
   pname = "scipy";
diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix
index 1cef1510ccf..0e4b6cfa1e4 100644
--- a/pkgs/development/python-modules/serversyncstorage/default.nix
+++ b/pkgs/development/python-modules/serversyncstorage/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, buildPythonPackage
+{ buildPythonPackage
 , fetchgit
 , isPy27
 , testfixtures
diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix
index 006f52f1d38..8c66df80dc5 100644
--- a/pkgs/development/python-modules/smart_open/default.nix
+++ b/pkgs/development/python-modules/smart_open/default.nix
@@ -1,6 +1,5 @@
 { lib
 , buildPythonPackage
-, isPy3k
 , fetchPypi
 , boto
 , boto3
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 16c1841a3d6..d2a306356b6 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -1,7 +1,5 @@
 { lib
-, pkgs
 , buildPythonPackage
-, python
 , fetchPypi
 , pythonOlder
 , html5lib
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 211419f86b1..50d58877b7e 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -3,7 +3,6 @@
 , buildPythonPackage
 , pytest
 , mock
-, pytest_xdist
 , isPy3k
 , pysqlite
 }:
diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix
index 9ac04e18e4f..a122a0c40ec 100644
--- a/pkgs/development/python-modules/sseclient/default.nix
+++ b/pkgs/development/python-modules/sseclient/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchPypi
 , requests, six
-, backports_unittest-mock, pluggy, pytest, pytestrunner }:
+, backports_unittest-mock, pytest, pytestrunner }:
 
 buildPythonPackage rec {
   pname = "sseclient";
diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix
index 3c650bd60dd..7a93d64a89f 100644
--- a/pkgs/development/python-modules/syncserver/default.nix
+++ b/pkgs/development/python-modules/syncserver/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, buildPythonPackage
+{ buildPythonPackage
 , fetchgit
 , isPy27
 , unittest2
diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix
index c56a5d7889f..9f8087a305d 100644
--- a/pkgs/development/python-modules/tempora/default.nix
+++ b/pkgs/development/python-modules/tempora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ buildPythonPackage, fetchPypi
 , setuptools_scm
 , six, pytz}:
 
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 21b21f174d0..4e3621157f9 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchurl
 , buildPythonPackage
-, isPy3k, isPy35, isPy36, pythonOlder
+, isPy3k, isPy36, pythonOlder
 , astor
 , gast
 , numpy
diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index 628be2e946a..1e35d95c5e1 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, mock, manuel, pytest, sybil, zope_component, django }:
+, mock, manuel, pytest, sybil, zope_component }:
 
 buildPythonPackage rec {
   pname = "testfixtures";
diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index d4243024821..9b22ad3e545 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -4,7 +4,6 @@
 , fetchPypi
 , cachetools
 , cld2-cffi
-, cython
 , cytoolz
 , ftfy
 , ijson
diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix
index 0ffaf315d54..0ced52c7ba1 100644
--- a/pkgs/development/python-modules/thespian/default.nix
+++ b/pkgs/development/python-modules/thespian/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, lib }:
+{ fetchPypi, buildPythonPackage, lib }:
 
 buildPythonPackage rec {
   version = "3.9.2";
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index b5812820023..88e6c8d1674 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , lib
-, pkgs
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -11,7 +10,6 @@
 , msgpack-python
 , preshed
 , numpy
-, python
 , murmurhash
 , pathlib
 , hypothesis
diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix
index b55c42cfa56..edc4bbdebb1 100644
--- a/pkgs/development/python-modules/tiros/default.nix
+++ b/pkgs/development/python-modules/tiros/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ fetchPypi, buildPythonPackage
 , semantic-version, boto3, flask, docutils, requests
 }:
 
diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix
index 829d7bcfcb2..6f3eae60c63 100644
--- a/pkgs/development/python-modules/todoist/default.nix
+++ b/pkgs/development/python-modules/todoist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, python, buildPythonPackage
+{ stdenv, fetchPypi, buildPythonPackage
 , requests }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix
index c6efe5ba239..44fcb9b46ff 100644
--- a/pkgs/development/python-modules/tokenserver/default.nix
+++ b/pkgs/development/python-modules/tokenserver/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, buildPythonPackage
+{ buildPythonPackage
 , fetchgit
 , testfixtures
 , cornice
diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix
index 359f13e2a00..4ceeb026634 100644
--- a/pkgs/development/python-modules/tox/default.nix
+++ b/pkgs/development/python-modules/tox/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildPythonPackage
+{ buildPythonPackage
 , fetchPypi
 , py
 , virtualenv
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 87fa393ce5e..0b77f706801 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -5,8 +5,6 @@
 , coverage
 , glibcLocales
 , flake8
-, matplotlib
-, pandas
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 0cfc8c3e14a..5bd0f5f81d2 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }:
+{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
 buildPythonPackage rec {
   pname = "typed-ast";
   version = "1.1.0";
diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix
index 3bb75fb2ac2..8320500fc14 100644
--- a/pkgs/development/python-modules/tzlocal/default.nix
+++ b/pkgs/development/python-modules/tzlocal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, tzlocal, pytz }:
+, pytz }:
 
 buildPythonPackage rec {
   pname = "tzlocal";
diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix
index 235f33da599..42588347c85 100644
--- a/pkgs/development/python-modules/ukpostcodeparser/default.nix
+++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "UkPostcodeParser";
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index 276ed481601..eb2fa2bd042 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, cmake
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, cmake
 , pyqt5, numpy, scipy, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index ab4ce1be2b1..805941cab60 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -7,7 +7,6 @@
 , contextlib2
 , wrapt
 , pytest
-, httpbin
 , pytest-httpbin
 , yarl
 , pythonOlder
diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix
index c152271af33..ef6089baa50 100644
--- a/pkgs/development/python-modules/warrant/default.nix
+++ b/pkgs/development/python-modules/warrant/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, fetchpatch
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
 , mock
 , boto3, envs, python-jose, requests }:
 
diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix
index b2ce75c43c3..32145623e4d 100644
--- a/pkgs/development/python-modules/wptserve/default.nix
+++ b/pkgs/development/python-modules/wptserve/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPy3k
diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix
index e98fcf205fd..c3ac5b51cb0 100644
--- a/pkgs/development/python-modules/wsproto/default.nix
+++ b/pkgs/development/python-modules/wsproto/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, h11, enum34 }:
+{ buildPythonPackage, fetchPypi, h11, enum34 }:
 
 buildPythonPackage rec {
   pname = "wsproto";
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 039a751a5e1..a9041f9a76f 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -5,7 +5,6 @@
 , numpy
 , pandas
 , python
-, fetchurl
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 418fcebaefd..f283479c8de 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -19,7 +19,6 @@
 , pytest
 , pytestcov
 , requests-mock
-, testtools
 , tornado
 }:
 
diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index 9aab2ba9e84..c23f332638d 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchPypi
 , buildPythonPackage
-, isPy3k
 , zope_testrunner
 , transaction
 , six
diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix
index e2bf3a569d0..a4988332b22 100644
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 , zope_interface
 , zope_exceptions
 , zope_testing
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 68ab42a76dd..acaee897d93 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -47,11 +47,11 @@ let
                                              "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ];
   };
   deriveBiocAnn = mkDerive {
-    mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html";
+    mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html";
     mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ];
   };
   deriveBiocExp = mkDerive {
-    mkHomepage = {name, biocVersion}: "http://www.bioconductor.org/packages/${name}.html";
+    mkHomepage = {name}: "http://www.bioconductor.org/packages/${name}.html";
     mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ];
   };
   deriveCran = mkDerive {
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 2f9a8223832..b1d0b76f086 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -1,4 +1,4 @@
-{ buildRubyGem, makeWrapper, ruby, coreutils }:
+{ buildRubyGem, ruby }:
 
 buildRubyGem rec {
   inherit ruby;
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 30d82aca83a..fb0f7414841 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind, fetchpatch }:
+{ stdenv, qmake, qtbase, perl, python, php, kcachegrind }:
 
 let
   name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;
diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
index b174d6c069b..b9b9b8abfb9 100644
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ b/pkgs/development/tools/analysis/radare/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl,
+{stdenv, fetchurl, pkgconfig, libusb, readline, lua, perl,
 gtk2 ? null, vte ? null, gtkdialog ? null,
 python ? null,
 ruby ? null,
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 131533896ff..cbcfa981b6b 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
+{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
 
 stdenv.mkDerivation rec {
   name = "valgrind-3.13.0";
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 5bda2d945eb..19609e15c76 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonApplication, fetchFromGitHub, makeWrapper
+{ lib, buildPythonApplication, fetchFromGitHub
 , arrow, futures, logfury, requests, six, tqdm
 }:
 
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index 953a10ca47a..5f2e9b5f440 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, binutils, cmake, zlib, fetchFromGitHub }:
+{ stdenv, cmake, zlib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   version = "2018-06-15";
diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index 5d486f47844..e64bf432b38 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }:
+{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "buck-${version}";
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 3729abfe247..adb279cdea6 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
+{ stdenv, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
 
 let
   withPlugins = plugins: runCommand "wrapped-${package.name}" {
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index f6da92fe621..c61bf3287db 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2
+{ stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2
 , useNcurses ? false, ncurses, useQt4 ? false, qt4, ps
 , buildPlatform, hostPlatform
 }:
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 9ff32f1b348..e77647b2fed 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchpatch, python }:
+{ lib, python }:
 
 let newPython = python.override {
   packageOverrides = self: super: {
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 52e29acc9d8..b9a8c97bd5e 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }:
+{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
 
 let
 
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index f14f6adf5fe..3cb906d50ed 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, stdenv, ninja, pkgconfig, targetPlatform, writeTextDir, substituteAll }: let
+{ lib, python3Packages, stdenv, targetPlatform, writeTextDir, substituteAll }: let
   targetPrefix = lib.optionalString stdenv.isCross
                    (targetPlatform.config + "-");
 in python3Packages.buildPythonApplication rec {
diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix
index 5da32f2334a..c394d87e09e 100644
--- a/pkgs/development/tools/build-managers/nant/default.nix
+++ b/pkgs/development/tools/build-managers/nant/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
+{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
 , targetVersion ? "4.5" }:
 
 let
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 38a197aa900..1ad52f327e1 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages, runCommand, curl }:
+{ stdenv, pythonPackages }:
 
 with stdenv.lib;
 with pythonPackages;
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index ff6dc07ea9e..d9e260a13de 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, writeText, callPackage, fetchurl,
+{ stdenv, fetchurl,
   fetchHex, erlang, hermeticRebar3 ? true,
-  tree, fetchFromGitHub, hexRegistrySnapshot }:
+  tree, hexRegistrySnapshot }:
 
 let
   version = "3.6.1";
diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix
index d3842a39f18..4b0242a3956 100644
--- a/pkgs/development/tools/build-managers/scons/common.nix
+++ b/pkgs/development/tools/build-managers/scons/common.nix
@@ -1,6 +1,6 @@
 { version, sha256 }:
 
-{ stdenv, fetchurl, fetchpatch, python2Packages }:
+{ stdenv, fetchurl, python2Packages }:
 
 let name = "scons";
 in python2Packages.buildPythonApplication {
diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index f52d53526fa..3bd31523412 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, stdenv }:
+{ callPackage }:
 
 let
   mkScons = args: callPackage (import ./common.nix args) { };
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index 000943f117f..e86d61cf6c9 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2 }:
+{ stdenv, fetchurl, python2 }:
 
 stdenv.mkDerivation rec {
   name = "waf-${version}";
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 2dca2b6cd42..95ee4e93f2a 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
+{ stdenv, buildGoPackage, fetchFromGitHub
 , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
 , go-md2man }:
 
diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix
index f42adffc5f4..603b155ee4f 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub
 , pythonPackages
-, pkgconfig
 , cmake
 , llvmPackages
 , withMan ? true
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index df06793eaec..1d81d469eb2 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby_2_4, perl, autoconf }:
+{ lib, bundlerEnv, ruby_2_4, perl, autoconf }:
 
 bundlerEnv {
   # Last updated via:
diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix
index f96d3e810ca..3e3e239fbfb 100644
--- a/pkgs/development/tools/compass/default.nix
+++ b/pkgs/development/tools/compass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "compass-1.0.3";
diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix
index 8d43736d3a8..b2b903b095c 100644
--- a/pkgs/development/tools/container-linux-config-transpiler/default.nix
+++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 with lib;
 
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 7f66317167a..46104e78d1d 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, jre, makeWrapper, fetchMavenArtifact
+{ stdenv, fetchurl, jre, makeWrapper
 , mysqlSupport ? true, mysql_jdbc ? null }:
 
 assert mysqlSupport -> mysql_jdbc != null;
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index 9a7a600d134..b101e52aad9 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "delve-${version}";
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index 905314efe5a..26d96a64126 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , pythonPackages
 , glibcLocales
 , devpi-server
diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix
index 6823ae3372c..f3ade82e52e 100644
--- a/pkgs/development/tools/devpi-server/default.nix
+++ b/pkgs/development/tools/devpi-server/default.nix
@@ -1,4 +1,4 @@
- { stdenv, pythonPackages, glibcLocales, nginx }:
+ { stdenv, pythonPackages, nginx }:
 
 pythonPackages.buildPythonApplication rec {
   name = "${pname}-${version}";
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index f6920a83e09..7e8a4159072 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool
-, makeWrapper, python2Packages }:
+{fetchurl, pkgconfig, libxml2Python, libxslt, intltool
+, python2Packages }:
 
 python2Packages.buildPythonApplication {
   name = "gnome-doc-utils-0.20.10";
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index 253f5b374d3..de9fb82f66f 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "easyjson-unstable-${version}";
diff --git a/pkgs/development/tools/egg2nix/chicken-eggs.nix b/pkgs/development/tools/egg2nix/chicken-eggs.nix
index 4ec9e0daa47..1f786f127c9 100644
--- a/pkgs/development/tools/egg2nix/chicken-eggs.nix
+++ b/pkgs/development/tools/egg2nix/chicken-eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv }:
+{ pkgs }:
 rec {
   inherit (pkgs) eggDerivation fetchegg;
 
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 38432e58d0d..695a532305a 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }:
+{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }:
 
 let
   version = "1.8.2";
diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix
index 082edb37a4f..e21749f90d0 100644
--- a/pkgs/development/tools/erlang/hex2nix/default.nix
+++ b/pkgs/development/tools/erlang/hex2nix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildRebar3, buildHex,
+{ fetchFromGitHub, buildRebar3,
 
   # Erlang dependencies:
   ibrowse_4_2_2,
diff --git a/pkgs/development/tools/erlang/relx-exe/default.nix b/pkgs/development/tools/erlang/relx-exe/default.nix
index df14c29c372..9bbdc8c8334 100644
--- a/pkgs/development/tools/erlang/relx-exe/default.nix
+++ b/pkgs/development/tools/erlang/relx-exe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, beamPackages, buildRebar3, buildHex, fetchHex
+{ stdenv, buildHex
 
 , getopt_0_8_2, erlware_commons_1_0_0, cf_0_2_2 }:
 
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index d6cc527e641..18367d14f6e 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }:
+{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
 
 buildGoPackage rec {
   name = "fac-${version}";
diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index 3d4d542d2f9..4c67a45d8c3 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pandoc, man }:
+{ stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
   name = "git-ftp-${version}";
   version = "1.5.1";
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix
index 4b87e74a630..9a783deecee 100644
--- a/pkgs/development/tools/go-bindata/default.nix
+++ b/pkgs/development/tools/go-bindata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-bindata-${version}";
diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix
index fe159c85c3d..5e1cd03e0af 100644
--- a/pkgs/development/tools/go-outline/default.nix
+++ b/pkgs/development/tools/go-outline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "go-outline-${version}";
diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix
index e47b84354d6..52cd37f9885 100644
--- a/pkgs/development/tools/go-repo-root/default.nix
+++ b/pkgs/development/tools/go-repo-root/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-repo-root-${version}";
diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix
index 9a8b592b038..38ceea7d417 100644
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/pkgs/development/tools/go-symbols/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-symbols-${version}";
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 2501c36dd5c..a20e1658988 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gocode-${version}";
diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix
index e4ef9d26da2..fcdb56460e1 100644
--- a/pkgs/development/tools/goconvey/default.nix
+++ b/pkgs/development/tools/goconvey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "goconvey-${version}";
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 6644c8fcfc4..3227ed8eec2 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "godef-${version}";
diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
index 5c69f34e28b..14c319320d0 100644
--- a/pkgs/development/tools/goimports/default.nix
+++ b/pkgs/development/tools/goimports/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "goimports-${version}";
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index 99f049314ae..a617e582c98 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "lint-${version}";
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
index f1452bc1211..86b7246b411 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gomodifytags-${version}";
diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix
index 298657fe38c..ea9c92c0d0a 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gopkgs-${version}";
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
index ad22d4ea407..b8230561fb4 100644
--- a/pkgs/development/tools/gotags/default.nix
+++ b/pkgs/development/tools/gotags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gotags-${version}";
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix
index ccdab780e6c..6c8270f8598 100644
--- a/pkgs/development/tools/gotests/default.nix
+++ b/pkgs/development/tools/gotests/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gotests-${version}";
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index e9a7e7ac891..4bbb6b0bd4f 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, go, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gotools-${version}";
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index a80f1569329..440b5e2eb0b 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "govers-${version}";
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index 65bc55c6d8d..69b20dd3a17 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gox-${version}";
diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix
index 31697750a70..a2a049615b7 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, writeText, jshon, electron, hyper-haskell-server, extra-packages ? [] }:
+{ stdenv, fetchFromGitHub, jshon, electron, hyper-haskell-server, extra-packages ? [] }:
 
 let
   binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages);
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix
index edf967f7d11..5e372b4f387 100644
--- a/pkgs/development/tools/haskell/lambdabot/default.nix
+++ b/pkgs/development/tools/haskell/lambdabot/default.nix
@@ -1,4 +1,4 @@
-{ lib, haskellLib, fetchpatch, makeWrapper, haskellPackages
+{ lib, haskellLib, makeWrapper, haskellPackages
 , mueval
 , withDjinn ? true
 , aspell ? null
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 88c4fc14a66..30dd7f21791 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
 , deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty
-, tasty-golden, transformers, fetchFromGitHub, fetchpatch
+, tasty-golden, transformers, fetchFromGitHub
 }:
 
 mkDerivation {
diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix
index 6511bdd2010..905580482d4 100644
--- a/pkgs/development/tools/hexio/default.nix
+++ b/pkgs/development/tools/hexio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth }:
+{ stdenv, fetchFromGitHub, python, pcsclite, pth }:
 
 stdenv.mkDerivation rec {
   pname = "hexio";
diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix
index e71e296212c..b2c764c5a85 100644
--- a/pkgs/development/tools/iaca/2.1.nix
+++ b/pkgs/development/tools/iaca/2.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }:
+{ stdenv, makeWrapper, requireFile, gcc, unzip }:
 with stdenv.lib;
 
 # v2.1: last version with NHM/WSM arch support
diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix
index af738bc71a9..34b9e1df190 100644
--- a/pkgs/development/tools/iaca/3.0.nix
+++ b/pkgs/development/tools/iaca/3.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, patchelf, unzip }:
+{ stdenv, requireFile, unzip }:
 with stdenv.lib;
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix
index e2aa27a96eb..b6a78071bc8 100644
--- a/pkgs/development/tools/irony-server/default.nix
+++ b/pkgs/development/tools/irony-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, llvmPackages, irony }:
+{ stdenv, cmake, llvmPackages, irony }:
 
 stdenv.mkDerivation rec {
   name = "irony-server-${version}";
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix
index dd0379e83a7..c53d6608efd 100644
--- a/pkgs/development/tools/jmespath/default.nix
+++ b/pkgs/development/tools/jmespath/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "jmespath-${version}";
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix
index d46f7b3e883..e8e8acd6a9a 100644
--- a/pkgs/development/tools/jp/default.nix
+++ b/pkgs/development/tools/jp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, jmespath }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "jp-${version}";
diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
index d53b3902133..694428f55a6 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "json2hcl";
diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix
index 11f4a5c8bd0..af5c0e9c2f9 100644
--- a/pkgs/development/tools/kube-aws/default.nix
+++ b/pkgs/development/tools/kube-aws/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 with lib;
 
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index 9e41ef38131..afac17b5251 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "leaps-${version}";
diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix
index 8adea820ec7..58f50dd2f7e 100644
--- a/pkgs/development/tools/librarian-puppet-go/default.nix
+++ b/pkgs/development/tools/librarian-puppet-go/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   name = "librarian-puppet-go-${version}";
diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix
index c4df52da170..a5dd0a88272 100644
--- a/pkgs/development/tools/manul/default.nix
+++ b/pkgs/development/tools/manul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "manul-unstable-2016-09-30";
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 660917ee9f1..265d425bbcf 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, which, pkgconfig, texinfo, perl, guile, libxml2 }:
+{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "autogen-${version}";
diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
index affc400a9ed..6646b847252 100644
--- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
+{ stdenv, fetchurl, perl, autoconf, doCheck ? false }:
 
 stdenv.mkDerivation rec {
   name = "automake-1.16.1";
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 0b71c6719dc..df4d0e3f47d 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPackages
 , fetchurl, zlib, autoreconfHook264
-, buildPlatform, hostPlatform, targetPlatform
+, hostPlatform, targetPlatform
 , noSysDirs, gold ? true, bison ? null
 }:
 
diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix
index ab84cb37656..2d7225ee03e 100644
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/pkgs/development/tools/misc/blackmagic/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub
-, gcc-arm-embedded, bash, libftdi
+, gcc-arm-embedded, libftdi
 , python, pythonPackages
 }:
 
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
index 51610349c45..6519f349bfc 100644
--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, cscope, tk, makeWrapper }:
+{ fetchurl, stdenv, tk, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "cbrowser-0.8";
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 34d1d8a829b..c5cb277c256 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }:
+{ stdenv, fetchurl, perl, zlib, makeWrapper }:
 
 let ccache = stdenv.mkDerivation rec {
   name = "ccache-${version}";
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix
index bf979767126..0b86deb5205 100644
--- a/pkgs/development/tools/misc/cquery/default.nix
+++ b/pkgs/development/tools/misc/cquery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ fetchFromGitHub, makeWrapper
 , cmake, llvmPackages, ncurses }:
 
 let
diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix
index 4df04f44f56..75ae9f1ba8b 100644
--- a/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -1,4 +1,4 @@
-{ pkgs, ctags, writeScriptBin }:
+{ pkgs, ctags }:
 
 with pkgs.stdenv.lib;
 
diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index 09d1276ed42..591254c73f5 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, gettext
+{ stdenv, fetchurl, ncurses
 , withLibrary ? false, libtool
 , unicodeSupport ? true
 }:
diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 4d8a9b05847..a1f33fdfc9e 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , autoreconfHook
-, findutils                     # for xargs
+                     # for xargs
 , gettext
 , libtool
 , makeWrapper
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 296d9673d8f..f0f21f8f4d5 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, libtool, makeWrapper
-, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags, pkgconfig
+, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 4fdd017306a..cf516b16f4b 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -1,9 +1,9 @@
 { stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub
 , makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
 , gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
-, guile, perl, postgresql, aws-sdk-cpp, nukeReferences, git, boehmgc
+, guile, perl, postgresql, nukeReferences, git, boehmgc
 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
-, rpm, dpkg, cdrkit, fetchpatch, pixz }:
+, rpm, dpkg, cdrkit, pixz }:
 
 with stdenv;
 
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 08729f6b41b..d92b20a12b0 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
-, procps, autoreconfHook, utilmacros, gnome2 }:
+, procps, utilmacros, gnome2 }:
 
 stdenv.mkDerivation rec {
   name = "intel-gpu-tools-1.22";
diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix
index 71bc3b87a7a..27f49ebcf38 100644
--- a/pkgs/development/tools/misc/linuxkit/default.nix
+++ b/pkgs/development/tools/misc/linuxkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, go, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "linuxkit-${version}";
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
index 9205f6caf0d..017c6ad8049 100644
--- a/pkgs/development/tools/misc/loccount/default.nix
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitLab }:
+{ stdenv, buildGoPackage, fetchFromGitLab }:
 buildGoPackage rec {
   name = "loccount-${version}";
   version = "1.2";
diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix
index 208f0ebd411..23b7119e7d7 100644
--- a/pkgs/development/tools/misc/md2man/default.nix
+++ b/pkgs/development/tools/misc/md2man/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, go, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 with lib;
 
diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix
index e6f7ac3290b..c45e7841d45 100644
--- a/pkgs/development/tools/misc/moby/default.nix
+++ b/pkgs/development/tools/misc/moby/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, go, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "moby-${version}";
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 219281f4ec1..7235af49c2e 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, libiconv, vanilla ? false }:
+{stdenv, fetchurl, libiconv, vanilla ? false }:
 
 with stdenv.lib;
 
diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix
index 3da98f38ebc..553ded815ef 100644
--- a/pkgs/development/tools/misc/stm32flash/default.nix
+++ b/pkgs/development/tools/misc/stm32flash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "stm32flash-0.5";
diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
index 9b4fd05dc0a..48a2e7bd2cb 100644
--- a/pkgs/development/tools/misc/swig/3.x.nix
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
 
 stdenv.mkDerivation rec {
   name = "swig-${version}";
diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index 4263b80789a..d6c5256ca84 100644
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libusb, fetchgit }:
+{ stdenv, unzip, libusb, fetchgit }:
 let
   version = "2.1";
 in
diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
index c8747e66e39..11caf8e7b20 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4
 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
-, cohttp, conduit, magic-mime, tzdata
+, cohttp, conduit, magic-mime
 }:
 
 assert stdenv.lib.versionOlder "4.02" ocaml.version;
diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix
index dea1ab2a445..6a34c1c130d 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }:
+{ stdenv, fetchMavenArtifact, fetchFromGitHub, jre, makeWrapper }:
 
 let
   version = "0.9.1";
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index f09dbfdb165..df7630e2d16 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
 , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap
+, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
 , libnotify}:
 let
   bits = if stdenv.system == "x86_64-linux" then "x64"
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index fc1513ecf34..6840bcac0dc 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
 
-, xorg, alsaLib, dbus, glib, gtk2, gtk3, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap
+, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig
+, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
 , libnotify
-, ffmpeg, libxcb, libXScrnSaver, cups
+, ffmpeg, libxcb, cups
 , sqlite, udev
 }:
 let
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index 7cdf7dc9396..7c7bf79acc7 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, ocaml, ncurses, writeText }:
+{ stdenv, fetchurl, ocaml, writeText }:
 
 let
   pname = "camlidl";
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index aa9feda985a..73b7da119ab 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, fetchurl, makeWrapper,
+{ stdenv, lib, fetchurl, makeWrapper,
   ocaml, unzip, ncurses, curl, aspcud
 }:
 
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 340c57f2817..74f450a9e3a 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder
 , lambdaTerm, cppo, makeWrapper
 }:
 
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 287bb8beb52..469e64acff0 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, hostPlatform, fetchurl, m4, perl, help2man }:
+{ stdenv, fetchurl, m4, perl, help2man }:
 
 stdenv.mkDerivation rec {
   name = "bison-3.0.5";
diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix
index 27596878f34..86c1f82678a 100644
--- a/pkgs/development/tools/parsing/hammer/default.nix
+++ b/pkgs/development/tools/parsing/hammer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, glib, pkgconfig, python, scons, pythonPackages }:
+{ stdenv, fetchgit, glib, pkgconfig, python, scons }:
 
 stdenv.mkDerivation rec {
   name = "hammer-${version}";
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
index 614ffe5e218..624866ea9e3 100644
--- a/pkgs/development/tools/quicktemplate/default.nix
+++ b/pkgs/development/tools/quicktemplate/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "quicktemplate-unstable-${version}";
diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix
index 88c975b5735..55797948a84 100644
--- a/pkgs/development/tools/redis-dump/default.nix
+++ b/pkgs/development/tools/redis-dump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }:
+{ lib, bundlerEnv, ruby, perl, autoconf }:
 
 bundlerEnv {
   name = "redis-dump-0.3.5";
diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index a2c75a02aa2..da3b27ebacc 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs, pkgconfig }:
+{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "rtags-${version}";
diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix
index 850fb5ad7f5..2b9792e4df2 100644
--- a/pkgs/development/tools/rubocop/default.nix
+++ b/pkgs/development/tools/rubocop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby, makeWrapper }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   pname = "rubocop";
diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix
index 370318d1ff2..50c890e3c47 100644
--- a/pkgs/development/tools/rust/rainicorn/default.nix
+++ b/pkgs/development/tools/rust/rainicorn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;
 
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index c3d71e2b2a3..48bfbdd689b 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg
+{ stdenv, fetchurl, makeWrapper, jre
 , htmlunit-driver, chromedriver, chromeSupport ? true }:
 
 with stdenv.lib;
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 041aee7a1c5..534c69200e0 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchgit, fetchFromGitHub, zip, unzip, firefox, bash}:
+{stdenv, fetchFromGitHub, zip, unzip, firefox, bash}:
 let
   s = # Generated upstream information
   rec {
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix
index f6687f4e432..a3499258a99 100644
--- a/pkgs/development/tools/textql/default.nix
+++ b/pkgs/development/tools/textql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, sqlite }:
+{ stdenv, buildGoPackage, fetchFromGitHub, sqlite }:
 
 buildGoPackage rec {
   name = "textql-${version}";
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix
index 0db25f88d76..ab90bb27bd5 100644
--- a/pkgs/development/tools/vim-vint/default.nix
+++ b/pkgs/development/tools/vim-vint/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, python3Packages, stdenv }:
+{ fetchFromGitHub, lib, python3Packages }:
 
 with python3Packages;
 
diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
index 2a4ddaf8039..0fbcd7b71a6 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/pkgs/development/tools/vndr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "vndr-${version}";
diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix
index b99780d4138..17c64f0548b 100644
--- a/pkgs/development/tools/ws/default.nix
+++ b/pkgs/development/tools/ws/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "ws-${version}";
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index f8b1c1bf31e..6a3267b7c34 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand
+{ lib, buildPackages, makeWrapper, writeText, runCommand
 , CoreServices, ImageIO, CoreGraphics
 , targetPlatform
 , xcodePlatform ? targetPlatform.xcodePlatform or "MacOSX"
diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix
index d585a35b0bc..4d62f5b8571 100644
--- a/pkgs/development/tools/xib2nib/default.nix
+++ b/pkgs/development/tools/xib2nib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }:
+{ stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }:
 
 stdenv.mkDerivation {
   name = "xib2nib-730e177";
diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index 52231d0a831..a08e01a48b7 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }:
+{ lib, buildPythonApplication, fetchPypi, pyyaml, xmltodict, jq }:
 
 buildPythonApplication rec {
   pname = "yq";
diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix
index 0220fbd8df8..e63f609fc2b 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "minify-${version}";
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index c51e1595ee7..4b45251cde5 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, udev, makeWrapper, makeDesktopItem }:
+{ stdenv, lib, gnome2, fetchurl, pkgs, xorg, makeWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   name = "postman-${version}";
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 0cf1b6f5e67..d05f19d3171 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, callPackage, perl, fetchurl, python2
+{ stdenv, lib, perl, fetchurl, python2
 , pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
 , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
 , openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2
diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix
index 0ada8d64685..f2be128fd99 100644
--- a/pkgs/games/90secondportraits/default.nix
+++ b/pkgs/games/90secondportraits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
 
 let
   pname = "90secondportraits";
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index 70413f0f941..2abc46690e9 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig
+{ stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig
 , libvorbis, libGL, boost, cmake, zlib, curl, SDL2_mixer, python3
 }:
 
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index d9a5df73f17..cb75b680270 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, stdenvNoCC, buildEnv, gccStdenv, lib, recurseIntoAttrs }:
+{ pkgs, stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs }:
 
 # To whomever it may concern:
 #
@@ -60,9 +60,7 @@ let
     legends-browser = callPackage ./legends-browser {};
 
     twbt = callPackage ./twbt {};
-    themes = recurseIntoAttrs (callPackage ./themes {
-      stdenv = stdenvNoCC;
-    });
+    themes = recurseIntoAttrs (callPackage ./themes { });
 
     # aliases
     phoebus-theme = themes.phoebus;
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index baad4529844..f781b0a71de 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, hostPlatform, lib, fetchurl, fetchFromGitHub, cmake, writeScriptBin, callPackage
+{ stdenv, buildEnv, lib, fetchFromGitHub, cmake, writeScriptBin
 , perl, XMLLibXML, XMLLibXSLT, zlib
 , enableStoneSense ? false,  allegro5, libGLU_combined
 , enableTWBT ? true, twbt
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 5e92bbb285b..4236d6bab98 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, qtbase
+{ stdenv, fetchFromGitHub, qtbase
 , qtdeclarative, cmake, texlive, ninja }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 54f0f0405ac..322a21ec3ad 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }:
+{ stdenv, symlinkJoin, dwarf-therapist, dwarf-fortress, makeWrapper }:
 
 let
   platformSlug = if stdenv.targetPlatform.is32bit then
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
index 3aa9e573f61..3e0d3dcc6d7 100644
--- a/pkgs/games/dwarf-fortress/lazy-pack.nix
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, buildEnv, callPackage
+{ stdenvNoCC, lib, buildEnv
 , dwarf-fortress, themes
   # This package should, at any given time, provide an opinionated "optimal"
   # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and
diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
index 5caaa9e05ca..0b8eb23a7b9 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchFromGitHub}:
+{lib, fetchFromGitHub}:
 
 with builtins;
 
diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix
index defee04e5c2..b718a92143c 100644
--- a/pkgs/games/gcs/default.nix
+++ b/pkgs/games/gcs/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, runCommand
 , jdk8, ant
 , jre8, makeWrapper
-, findutils
 }:
 
 let
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index df1dd47905e..ae1db1d8b4a 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper
+{ stdenv, fetchFromGitHub, cmake, makeWrapper
 , openal, fluidsynth, soundfont-fluid, libGL, SDL2
 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:
 
diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix
index 8d49d38b415..21d2ad87dfb 100644
--- a/pkgs/games/meritous/default.nix
+++ b/pkgs/games/meritous/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib, binutils }:
+{ stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }:
 
 stdenv.mkDerivation rec {
   name = "meritous-${version}";
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index a5b34933492..7c32d7faa3c 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -1,5 +1,4 @@
-{ stdenv
-, fetchurl
+{ fetchurl
 , python
 }:
 
diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix
index a693c79e8ce..aa4a06bc7d2 100644
--- a/pkgs/games/mrrescue/default.nix
+++ b/pkgs/games/mrrescue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
 
 let
   pname = "mrrescue";
diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index db959177eb5..d4ad1119b9f 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, writeScript, coreutils, ncurses, gzip, flex, bison
+{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
 , less, makeWrapper
 , x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5
 }:
diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix
index 7b848086794..0f045faf371 100644
--- a/pkgs/games/opendune/default.nix
+++ b/pkgs/games/opendune/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer, binutils }:
+{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer }:
 
 # - set the opendune configuration at ~/.config/opendune/opendune.ini:
 #     [opendune]
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index 8080c959638..4d01feaccc0 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
-, giflib, libXt, pkgconfig }:
+, libXt, pkgconfig }:
 
 let
   openscenegraph_ = openscenegraph.overrideDerivation (self: {
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 9e67c7847f8..e5783ec5396 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub,
+{ stdenv, fetchFromGitHub,
   SDL2, cmake, curl, fontconfig, freetype, icu, jansson, libiconv, libpng,
   libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib
 }:
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index 582cafcc4d4..b4757265555 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file
+{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip, zip, file
 , curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick
 , openal , opusfile, libogg
 }:
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index a936ca13412..9a82c678f37 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, fetchpatch, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost
+{stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost
 , SDL, SDL_image, SDL_mixer, SDL_gfx }:
 
 let version = "1.0.0.2018.01.28"; in
diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index 122ce3f6e2f..aae49eedd7c 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }:
+{ stdenv, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }:
 
 let boost = boost155;
 in stdenv.mkDerivation rec {
diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix
index 69b166664be..4ab53d67732 100644
--- a/pkgs/games/quake3/wrapper/default.nix
+++ b/pkgs/games/quake3/wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, lib, fetchurl, libGL, ioquake3, makeWrapper }:
+{ stdenv, buildEnv, lib, libGL, ioquake3, makeWrapper }:
 
 { paks, name ? (stdenv.lib.head paks).name, description ? "" }:
 
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index a038957f701..e75698e7279 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost,
-  pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip,
+{ fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost,
+  pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip,
   angelscript, ogrepaged, mysocketw, libxcb
   }:
 
diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
index 2636bc9e799..58ed85c79fd 100644
--- a/pkgs/games/sienna/default.nix
+++ b/pkgs/games/sienna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
 
 let
   pname = "sienna";
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 83a85415664..1dcf432ccd4 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
-, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils
+, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined
 , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
 , jdk ? null, python ? null, systemd, libunwind, which, minizip
 , withAI ? true # support for AI Interfaces and Skirmish AIs
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 2000398b537..632a047e96c 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar
-, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk2, doxygen, spring
+, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring
 , makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index d51d1bb154d..4f9406abd83 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, nasm
+{ stdenv, lib, fetchFromGitHub, cmake, nasm
 , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis
 , glew, libpulseaudio, udev
 }:
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index e0f9bae2e39..cfef1ed0db2 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }:
+{ stdenv, fetchurl, glibc, libX11, libGLU_combined }:
 
 with stdenv.lib;
 stdenv.mkDerivation {
diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index 522a1a2857d..b941f3bd2e0 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -1,6 +1,6 @@
 { fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
 libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis,
-libpng, zlib, bash, makeWrapper }:
+libpng, zlib, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "torcs-1.3.7";
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
index dd60c0efb59..00592f7c39b 100644
--- a/pkgs/games/uqm/default.nix
+++ b/pkgs/games/uqm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, pkgconfig, libGLU_combined
-, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod
+, SDL, SDL_image, libpng, libvorbis, libogg, libmikmod
 
 , use3DOVideos ? false, requireFile ? null, writeText ? null
 , haskellPackages ? null
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index ce20d1b3f17..7e43fbf2c88 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU_combined, SDL2, SDL2_image
-, libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin
+, libvorbis, bullet, curl, gettext, writeTextFile
 
 , data ? fetchsvn {
     url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data";
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 45b4e5a5891..75afddf52c8 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
-, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
+, pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
 , Cocoa, Foundation
 , enableTools ? false
 }:
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index 222275a2ba1..1e2c17814d6 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, python, gettext
 , boost, libpng, zlib, glew, lua, doxygen, icu
-, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf, SDL2_gfx
+, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix
index af76e85346f..9684f3b876a 100644
--- a/pkgs/games/worldofgoo/default.nix
+++ b/pkgs/games/worldofgoo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, config, requireFile, fetchurl
+{ stdenv, requireFile
 , libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined
 , demo ? false }:
 
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 6d9ae55e639..ac7bf7973d7 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , # required for both
-  unzip, libjpeg, zlib, libvorbis, curl, patchelf
+  unzip, libjpeg, zlib, libvorbis, curl
 , # glx
   libX11, libGLU_combined, libXpm, libXext, libXxf86vm, alsaLib
 , # sdl
diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix
index 35fcb4a0eec..3d60dab6fe0 100644
--- a/pkgs/games/zandronum/sqlite.nix
+++ b/pkgs/games/zandronum/sqlite.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "sqlite-zandronum-3.0";
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 0f5ee05349d..1786a4996a3 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, cups, ghostscript }:
+{ stdenv, fetchFromGitHub, cmake, zlib, cups }:
 
 stdenv.mkDerivation rec {
 
diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix
index 6f27985bdbf..701d4b6a100 100644
--- a/pkgs/misc/cups/drivers/hl1110/default.nix
+++ b/pkgs/misc/cups/drivers/hl1110/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, patchelf}:
+{stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk}:
 
 let
   version = "3.0.1-1";
diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
index c5b63b07318..f69c972c999 100644
--- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cups, dpkg, ghostscript, patchelf, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
+{ stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "mfcj470dw-cupswrapper-${version}";
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
index 40e65136f1b..ff71df5dc1b 100644
--- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, patchelf, utillinux, xxd
+{ stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, utillinux, xxd
 , ghostscript, a2ps }:
 
 # Why:
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
index e8da0541f6c..48636e1f76a 100644
--- a/pkgs/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript }:
+{ stdenv, fetchurl, cups, libusb, libxml2 }:
 
 let
 
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 2cdaca8d783..bde918a7c48 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, fetchurl, cups, zlib }:
+{ stdenv, fetchsvn, cups, zlib }:
 let rev = "315"; in
 stdenv.mkDerivation rec {
   name = "splix-svn-${rev}";
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index d15680b6363..d85331e7882 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
-, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi
+, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi
 , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript
 , mupdf
 }:
diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix
index 88b88f59afc..1dac6034fda 100644
--- a/pkgs/misc/drivers/epson-alc1100/default.nix
+++ b/pkgs/misc/drivers/epson-alc1100/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, stdenv_32bit, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }:
+{ stdenv, fetchurl, cups, pkgsi686Linux, dpkg, psutils, makeWrapper, ghostscript, bash }:
 
 let
   version = "1.2-0";
diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix
index 37f2361b45e..91dce834a4b 100644
--- a/pkgs/misc/drivers/hplip/3.16.11.nix
+++ b/pkgs/misc/drivers/hplip/3.16.11.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchurl, substituteAll
 , pkgconfig
-, makeWrapper
-, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
-, net_snmp, openssl, polkit, nettools
+, cups, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
+, net_snmp, openssl, nettools
 , bash, coreutils, utillinux
 , qtSupport ? true
 , withPlugin ? false
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 4b88d4a96fa..59a75dab883 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchurl, substituteAll
 , pkgconfig
-, makeWrapper
 , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends
 , dbus, file, ghostscript, usbutils
-, net_snmp, openssl, perl, polkit, nettools
+, net_snmp, openssl, perl, nettools
 , bash, coreutils, utillinux
 , withQt5 ? true
 , withPlugin ? false
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix
index f4110458062..a7d5710a279 100644
--- a/pkgs/misc/drivers/postscript-lexmark/default.nix
+++ b/pkgs/misc/drivers/postscript-lexmark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, rpmextract }:
+{ stdenv, fetchurl, rpmextract }:
 let
   version = "20160218";
 in
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index e0fe451ce24..64b485bea31 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,4 +1,4 @@
-{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg, intltool }:
+{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, gnome3, gdk_pixbuf, librsvg, intltool }:
 let pkg = import ./base.nix {
   version = "3.1.0";
   pkgName = "image-analyzer";
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index d6c85c53b42..9403a969e8f 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -1,4 +1,4 @@
-{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }:
+{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gnome3, gdk_pixbuf, librsvg }:
 let
   pkg = import ./base.nix {
     version = "3.1.0";
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index 081846f78e3..73ef7bc6a18 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel, libelf }:
+{ stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation rec {
   name = "vhba-${version}";
diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix
index 86dfd25d175..aecfd7698f0 100644
--- a/pkgs/misc/emulators/dosbox/unstable.nix
+++ b/pkgs/misc/emulators/dosbox/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }:
+{ stdenv, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }:
 
 let revision = "4025";
     revisionDate = "2017-07-02";
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index a0999e6caf5..5de8ac46b90 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, gcc, glib, gtk3,
+{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, glib, gtk3,
   libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }:
 
 with stdenv.lib;
diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix
index 7de9b576ef3..9ff99110ecc 100644
--- a/pkgs/misc/emulators/mupen64plus/default.nix
+++ b/pkgs/misc/emulators/mupen64plus/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }:
+{stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }:
 
 stdenv.mkDerivation rec {
   name = "mupen64plus-${version}";
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix
index 8a366ba737f..9eb353ede58 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/pkgs/misc/emulators/nestopia/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3
-, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils, gsettings-desktop-schemas
+{ stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3
+, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils
 , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook
 }:
 
diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix
index 2e47cead8ec..65cc0bd9c05 100644
--- a/pkgs/misc/emulators/qmc2/default.nix
+++ b/pkgs/misc/emulators/qmc2/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl, qmake, qttools, pkgconfig
+, fetchurl, qttools, pkgconfig
 , minizip, zlib
 , qtbase, qtsvg, qtmultimedia, qtwebkit, qttranslations, qtxmlpatterns
 , rsync, SDL2, xwininfo
diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index ffc494dad4c..40c1fcc6fde 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, cmake, dos2unix, glib, gst_all_1, makeWrapper, pkgconfig
+{ stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkgconfig
 , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib
 }:
 
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index 66ea5b12575..ac078f62251 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -5,10 +5,6 @@
 , ffmpeg
 , gettext
 , gtk2-x11
-, libpng
-, libpthreadstubs
-, libXdmcp
-, libxshmfence
 , libGLU_combined
 , openal
 , pkgconfig
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index 010c4721dc2..ae8fbe9e1f5 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libX11, libXaw
+{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libXaw
 , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem
 }:
 
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index ca67ca836ba..a8eacbe234c 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -6,7 +6,7 @@
 # };
 # Make additional configurations on demand:
 # wine.override { wineBuild = "wine32"; wineRelease = "staging"; };
-{ lib, pkgs, system, callPackage,
+{ lib, system, callPackage,
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
   libtxc_dxtn_Name ? "libtxc_dxtn_s2tc",
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 156db148435..3ea60e62c66 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,4 +1,4 @@
-{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
+{ stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
   wineRelease ? "stable",
   supportFlags
 }:
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 4a7fe0ff55b..5264e66279f 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, lib, wineUnstable, libtxc_dxtn_Name }:
+{ stdenv, callPackage, wineUnstable, libtxc_dxtn_Name }:
 
 with callPackage ./util.nix {};
 
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 182e176cacb..5839b076c0d 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, zlib, expat, openssl, autoconf
+{ stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
 , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec
 , libiconv, ijs
 , x11Support ? false, xlibsWrapper ? null
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 52b0abc48a7..391ac107ab7 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -6,7 +6,6 @@
 # Optional Dependencies
 , dbus ? null, libffado ? null, alsaLib ? null
 , libopus ? null
-, darwin
 
 # Extra options
 , prefix ? ""
diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index 046416cd9df..df83502aa88 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, guile, rsync, lilypond, gyre-fonts }:
+{ stdenv, fetchurl, fetchgit, rsync, lilypond, gyre-fonts }:
 
 with stdenv.lib;
 
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index d0b7458bf57..fb8de9b6a71 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -59,7 +59,7 @@
 
 { mkDerivation, substituteAll, pkgs }:
     { stdenv ? pkgs.stdenv, name, buildInputs ? []
-    , propagatedBuildInputs ? [], gcc ? stdenv.cc, cTags ? [], extraCmds ? ""
+    , propagatedBuildInputs ? [], gcc ? stdenv.cc, extraCmds ? ""
     , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}:
 
 mkDerivation {
diff --git a/pkgs/misc/phabricator/default.nix b/pkgs/misc/phabricator/default.nix
index 435cf2e0c9a..367e4e53442 100644
--- a/pkgs/misc/phabricator/default.nix
+++ b/pkgs/misc/phabricator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgs, ...  }:
+{ stdenv, pkgs }:
 
 stdenv.mkDerivation rec {
   version = "2014-07-16";
diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 82ce4c20df8..5e658abff47 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, writeText
+{ stdenv, fetchurl, writeText
 , xproto, libX11, libXext, libXrandr
 # default header can be obtained from
 # https://git.suckless.org/slock/tree/config.def.h
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index 86a6b4883ac..06d42da7936 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 2a628e0cdf4..2bf5274eeb4 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig
 , armTrustedFirmwareAllwinner
-, hostPlatform, buildPackages
+, buildPackages
 }:
 
 let
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8428a3b7894..672e4640946 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,9 +1,9 @@
 # TODO check that no license information gets lost
-{ config, lib, fetchurl, stdenv, python, git, go, cmake, vim, vimUtils, perl, ruby
+{ config, lib, stdenv, python, cmake, vim, vimUtils, ruby
 , which, fetchgit, llvmPackages, rustPlatform
-, xkb_switch, rustracerd, fzf, skim
+, xkb_switch, fzf, skim
 , python3, boost, icu, ncurses
-, ycmd, makeWrapper, rake
+, ycmd, rake
 , pythonPackages, python3Packages
 , substituteAll
 , languagetool
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index 6cec206b73a..5bc1dddeab8 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript
+{ stdenv, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript
 , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.
 }:
 
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 16ddb8fd405..68304d66224 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, callPackage, vscode-utils }:
+{ stdenv, callPackage, vscode-utils }:
 
 let
   inherit (vscode-utils) buildVscodeExtension buildVscodeMarketplaceExtension
diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index 41db2c1fcea..c33359ccbfc 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, vscode-utils
+{ lib, vscode-utils
 
 , pythonUseFixed ? false, python  # When `true`, the python default setting will be fixed to specified.
                                   # Use version from `PATH` for default setting otherwise.
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix
index 4c095278f91..d7ec669204c 100644
--- a/pkgs/misc/vscode-extensions/vscode-utils.nix
+++ b/pkgs/misc/vscode-extensions/vscode-utils.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, runCommand, vscode, unzip }:
+{ stdenv, lib, fetchurl, vscode, unzip }:
 
 let
   extendedPkgVersion = lib.getVersion vscode;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index 6cf7ee07b70..89ff68266a2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cctools, appleDerivation }:
+{ cctools, appleDerivation }:
 
 appleDerivation {
   nativeBuildInputs = [ cctools ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
index 302a657992a..29aa3d64cb0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, ed, unifdef }:
+{ appleDerivation, ed, unifdef }:
 
 appleDerivation {
   nativeBuildInputs = [ ed unifdef ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
index d73dc8f3ec2..542ea20de11 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }:
+{ appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }:
 
 appleDerivation {
   nativeBuildInputs = [ ed unifdef ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
index d3ffa1fa283..add51a61d3d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
index 1a01d032191..df5f6b7b8fd 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
index de691a056f3..2ee80d70264 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 386480d6290..1e27ead69f1 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo,
+{ stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo,
   dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile,
-  removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
+  removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil }:
 
 appleDerivation rec {
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix
index f09842630fd..e04142b8b11 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
index 35608587c56..318e2728fc2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchzip, version, bsdmake, perl, flex, yacc, writeScriptBin
+{ stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc
 }:
 
 # this derivation sucks
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
index fda7cd85e4f..7b1492799dd 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, libutil-new }:
+{ stdenv, appleDerivation, xcbuild, ncurses, libutil-new }:
 
 appleDerivation {
   # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264
diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
index 596ca25d70a..5d9781f3aa4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchurl, xcbuildHook }:
+{ stdenv, appleDerivation, xcbuildHook }:
 
 appleDerivation rec {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
index baa3b11225d..043c7b0bc70 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }:
+{ stdenv, appleDerivation, makeWrapper }:
 
 appleDerivation {
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
index 37dffaa9b20..7e1dc5309b1 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   dontBuild = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
index a572d46ceab..4220c50d61c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, appleDerivation, xcbuildHook }:
+{ stdenv, appleDerivation, xcbuildHook }:
 
 appleDerivation rec {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
index b947267ab14..f27b5ae1302 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix
@@ -1,5 +1,5 @@
 { stdenv, appleDerivation, xcbuildHook
-, lib, hostPlatform, Libc, xnu, libutil-new }:
+, Libc, xnu, libutil-new }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
index 5fcd04266d5..fd2c95563b4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, cctools, zlib }:
+{ appleDerivation, cctools, zlib }:
 
 appleDerivation {
   buildInputs = [ cctools zlib ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
index 80d629dfa3e..b24d94b9d70 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   dontBuild = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
index 86bc6e598f7..eed7982e9d8 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   # No clue why the same file has two different names. Ask Apple!
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
index 826dbed1dfe..ac33a24a8b4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index a43c00f7691..46e9e592ddc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   dontConfigure = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index d325e38b272..3d62c396122 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, lib, autoreconfHook, targetPlatform
+{ stdenv, appleDerivation, lib, targetPlatform
 , enableStatic ? targetPlatform.isiOS
 , enableShared ? !targetPlatform.isiOS
 }:
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
index 41b1bf74af9..4fd0ab8a7fb 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
index 5a2cd33d8a0..f3c7558cfc6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, Libinfo, configd, mDNSResponder }:
+{ appleDerivation, Libinfo, configd, mDNSResponder }:
 
 appleDerivation {
   buildInputs = [ Libinfo configd mDNSResponder ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
index aa73c281cab..e5637d6db41 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix
@@ -1,4 +1,4 @@
-{ Security, appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }:
+{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix
index 053dea134c7..cf9fe411533 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix
@@ -1,4 +1,4 @@
-{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_codesigning, libsecurity_utilities, perl }:
+{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, perl }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
index 07a3186caee..609d07fda10 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
@@ -1,4 +1,4 @@
-{ CF, Security, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }:
+{ CF, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }:
 appleDerivation {
   buildInputs = [
     libsecurity_utilities
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
index e811c4c11a8..1ab950a9233 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
@@ -1,4 +1,4 @@
-{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, sqlite, stdenv, osx_private_sdk }:
+{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, sqlite, stdenv, osx_private_sdk }:
 appleDerivation {
   buildInputs = [
     libauto
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix
index 63674808d93..f17ed785360 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
index cea5fc9a4e2..5c78182085b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
index 17c24bebfda..5668c376130 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   dontBuild = true;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
index 8baf62dba01..2b45fbdb45e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 1bbda6ab7ad..39c903a2e7b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, xcbuild, lib, hostPlatform
+{ stdenv, appleDerivation, lib
 , Librpcsvc, apple_sdk, pam, CF, openbsm }:
 
 appleDerivation rec {
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
index 08df235ed8c..91abb3ca07a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchurl, xcbuildHook, ncurses, bzip2, zlib, lzma }:
+{ stdenv, appleDerivation, xcbuildHook, ncurses, bzip2, zlib, lzma }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
index 2c7da5be6e4..74c9f254348 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, fetchzip, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }:
+{ appleDerivation, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }:
 
 appleDerivation {
   phases = [ "unpackPhase" "patchPhase" "installPhase" ];
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index 21d64979d7e..bd10dde5572 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -1,5 +1,4 @@
 { stdenv, binutils-unwrapped, cctools
-, hostPlatform, targetPlatform
 }:
 
 # Make sure both underlying packages claim to have prepended their binaries
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 0c908197acb..995e9af38cb 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook
-, libcxx, libcxxabi, libuuid
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook
+, libcxxabi, libuuid
 , libobjc ? null, maloader ? null
 , hostPlatform, targetPlatform
 , enableDumpNormalizedLibArgs ? false
diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix
index c1e29843147..6ed3b28eccc 100644
--- a/pkgs/os-specific/darwin/darling/default.nix
+++ b/pkgs/os-specific/darwin/darling/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchzip, cmake, bison, flex}:
+{stdenv, lib, fetchzip}:
 
 stdenv.mkDerivation rec {
   pname = "darling";
diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix
index 4566d82835f..f161a7a88e1 100644
--- a/pkgs/os-specific/darwin/security-tool/default.nix
+++ b/pkgs/os-specific/darwin/security-tool/default.nix
@@ -1,4 +1,4 @@
-{ CoreServices, Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk,
+{ Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk,
 fetchurl, gnustep, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl,
 libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp,
 libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin,
diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix
index fdc97304528..dd652dc5627 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/default.nix
+++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix
@@ -1,4 +1,4 @@
-{callPackage, stdenv, darwin, xcbuild}:
+{callPackage, darwin}:
 
 rec {
   corefoundation = callPackage ./corefoundation.nix {};
diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
index d5ed21cd9e2..b848265736e 100644
--- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
+++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
@@ -1,4 +1,4 @@
-{ lib, hostPlatform, targetPlatform
+{ targetPlatform
 , clang-unwrapped
 , binutils-unwrapped
 , runCommand
diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix
index df0ef80ff4d..97658c831eb 100644
--- a/pkgs/os-specific/linux/amdgpu-pro/default.nix
+++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, elfutils
 , xorg, patchelf, openssl, libdrm, udev
 , libxcb, libxshmfence, epoxy, perl, zlib
-, fetchFromGitHub, ncurses
+, ncurses
 , libsOnly ? false, kernel ? null
 }:
 
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 859593e4b9a..60ccad04eea 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, mount, umount, nfs-utils, e2fsprogs
+{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
 , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
 
 let
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 3104004b3d6..2796fed17dc 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel
+{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages, kernel
 , flex, bison, elfutils, python, luajit, netperf, iperf, libelf
 , systemtap
 }:
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index 275600d4278..626e978f1f1 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, kernel, perl, makeWrapper }:
+{ stdenv, fetchurl, kernel, perl, makeWrapper }:
 
 # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x
 
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 9423e7a33f4..9848882f3b8 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, kernel }:
+{ stdenv, fetchurl, kernel }:
 
 let
   version = "6.30.223.271";
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 06a2d430159..bfd79cb42dc 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, lib, buildPackages, fetchurl, fetchpatch
+{ stdenv, lib, buildPackages, fetchurl
 , enableStatic ? false
 , enableMinimal ? false
 , useMusl ? stdenv.hostPlatform.libc == "musl", musl
 , extraConfig ? ""
-, buildPlatform, hostPlatform
 }:
 
 assert stdenv.hostPlatform.libc == "musl" -> useMusl;
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index 9b7f69d4ab8..a8ffb133a90 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, sysctl }:
+{ stdenv, fetchurl, file, findutils, binutils, glibc, coreutils, sysctl }:
 
 stdenv.mkDerivation rec {
   name = "checksec-${version}";
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index e4c45a9440a..eb4e6a16e38 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake
+{ stdenv, fetchFromGitHub, pkgconfig, cmake
 
 # dependencies
 , glib, libXinerama
diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix
index d10b789f3e4..2b8efe7e744 100644
--- a/pkgs/os-specific/linux/cpupower/default.nix
+++ b/pkgs/os-specific/linux/cpupower/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, kernel, pciutils, gettext }:
+{ stdenv, buildPackages, kernel, pciutils, gettext }:
 
 stdenv.mkDerivation {
   name = "cpupower-${kernel.version}";
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index ad9b27f83fa..832167b6f26 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, protobuf, protobufc, asciidoc
-, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
+, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
 , python }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
index d25692b6cdf..45a7fe177f2 100644
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, kernel, onlyHeaders ? false }:
+{ fetchurl, stdenv, kernel ? false }:
 
 stdenv.mkDerivation rec {
   pname = "cryptodev-linux-1.9";
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index c57650e0806..794ebd126fa 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig
+{ stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig
 , dbus, glib, linuxHeaders, systemd }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 55be85d33f0..ad42590ad19 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, utillinux,
+{ stdenv, lib, unzip, utillinux,
   libusb1, evdi, systemd, makeWrapper, requireFile }:
 
 let
diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix
index e3f382ababc..180957ac2ad 100644
--- a/pkgs/os-specific/linux/ena/default.nix
+++ b/pkgs/os-specific/linux/ena/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, kernel, kmod }:
+{ stdenv, fetchFromGitHub, kernel }:
 
 stdenv.mkDerivation rec {
   version = "1.5.2";
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 6f6418edc3e..fb1a3e56388 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, python3, which }:
+{ stdenv, fetchurl, python3, which }:
 
 stdenv.mkDerivation rec {
   name = "fatrace-${version}";
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 724498b960c..47d56cbf796 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, runCommand, git, cacert, gnupg }:
+{ stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index d813258f95a..7cc58c19c07 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -2,7 +2,6 @@
 
 { stdenv, fetchFromGitHub, fetchpatch
 , fusePackages, utillinux, gettext
-, autoconf, automake, libtool
 , meson, ninja, pkgconfig
 , autoreconfHook
 }:
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index cdbcca55d2f..594f966c2f4 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, utillinux }:
+{ callPackage, utillinux }:
 
 let
   mkFuse = args: callPackage (import ./common.nix args) {
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index 581d0f841b9..c8146c39cf5 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, intltool, gettext, pkgconfig
-, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl
+{ stdenv, fetchurl, intltool, pkgconfig
+, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl
 , pulseaudioSupport ? true, libpulseaudio ? null }:
 
 assert pulseaudioSupport -> libpulseaudio != null;
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 3f5ed788bb2..4204105bb60 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, config, lib, flex, bash, bison, db, iptables, pkgconfig }:
+{ fetchurl, stdenv, config, flex, bash, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index d0a8950a508..4caa0acb4b6 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, sysfsutils, gnutls, openssl
+, sysfsutils, openssl
 , libcap, opensp, docbook_sgml_dtd_31
 , libidn, nettle
 , SGMLSpm, libgcrypt }:
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 01cab57f719..677bb076b0c 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -1,5 +1,5 @@
 { stdenvNoCC, lib, buildPackages
-, buildPlatform, hostPlatform
+, hostPlatform
 , fetchurl, perl
 }:
 
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index fe46b9eab40..b2171067307 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,8 +1,7 @@
 { buildPackages, runCommand, nettools, bc, bison, flex, perl, gmp, libmpc, mpfr, openssl
-, ncurses ? null
 , libelf
 , utillinux
-, writeTextFile, ubootTools
+, writeTextFile
 }:
 
 let
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index e0826aaa9d4..1a365046f5f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgs }:
+{ fetchpatch }:
 
 rec {
   bridge_stp_helper =
diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix
index 201f170c258..6932afdf478 100644
--- a/pkgs/os-specific/linux/keyutils/default.nix
+++ b/pkgs/os-specific/linux/keyutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnumake, file }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "keyutils-${version}";
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 0f542b9e382..a24024112c9 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, coreutils, libuuid
+{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, udev, utillinux, libuuid
 , thin-provisioning-tools, enable_dmeventd ? false }:
 
 let
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 491f89f3cb4..3c158e228f3 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, perl, docbook2x
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x
 , docbook_xml_dtd_45, python3Packages, pam
 
 # Optional Dependencies
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index a825314683e..77b0d915edb 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, gnugrep, kmod }:
+{ stdenv, lib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "mbpfan-${version}";
diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix
index 76a34052991..bd4b3d9377f 100644
--- a/pkgs/os-specific/linux/microcode/amd.nix
+++ b/pkgs/os-specific/linux/microcode/amd.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, firmwareLinuxNonfree, libarchive }:
+{ stdenv, firmwareLinuxNonfree, libarchive }:
 
 stdenv.mkDerivation rec {
   name = "amd-ucode-${firmwareLinuxNonfree.version}";
diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
index f4e7ad1f234..1b5925a5581 100644
--- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mkinitcpio-nfs-utils-0.3";
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 6bcd2ea692d..d6936ccd650 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -1,5 +1,4 @@
 { stdenv, lib, fetchurl
-, buildPackages
 , linuxHeaders ? null
 , useBSDCompatHeaders ? true
 }:
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 8eeaf502020..6fcb28a985c 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, fetchurl, fetchpatch }:
+{ lib, callPackage, fetchurl }:
 
 let
   generic = args: callPackage (import ./generic.nix args) { };
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index b5435f23e71..0ededc08050 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -12,7 +12,7 @@
 , patches ? []
 }:
 
-{ stdenv, callPackage, pkgsi686Linux, fetchurl, fetchpatch
+{ stdenv, callPackage, pkgsi686Linux, fetchurl
 , kernel ? null, xorg, zlib, perl, nukeReferences
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index 21e6cb5d500..474d3a69119 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -1,6 +1,6 @@
 nvidia_x11: sha256:
 
-{ stdenv, lib, fetchurl, m4 }:
+{ stdenv, fetchurl, m4 }:
 
 stdenv.mkDerivation rec {
   name = "nvidia-persistenced-${nvidia_x11.version}";
diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index ac8a1c7de4a..a2a272f1b3a 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig, utillinux, which
-, procps, libcap_ng, openssl, python27, iproute , perl
+, procps, libcap_ng, openssl, python27 , perl
 , kernel ? null }:
 
 with stdenv.lib;
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 8ae73189276..43f184f384d 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison, p7zip }:
+{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip }:
 
 assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
 
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index 63d159e1884..1a7a31d978a 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cryptsetup, dbus, dbus-glib, intltool, ntfs3g, utillinux
+{ stdenv, fetchurl, intltool, ntfs3g, utillinux
 , mediaDir ? "/media/"
 , lockDir ? "/var/lock/pmount"
 , whiteList ? "/etc/pmount.allow"
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index 000d11af87d..be93ff6f2eb 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, lib, requireFile, makeWrapper, substituteAll, p7zip
+{ stdenv, lib, makeWrapper, p7zip
 , gawk, utillinux, xorg, glib, dbus-glib, zlib
 , kernel ? null, libsOnly ? false
 , undmg, fetchurl
-, libelf
 }:
 
 assert (!libsOnly) -> kernel != null;
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 96306a9d5c6..879c427b049 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, kernel, bc }:
+{ stdenv, fetchFromGitHub, kernel, bc }:
 
 stdenv.mkDerivation rec {
   name = "rtl8812au-${kernel.version}-${version}";
diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix
index 99b42fc7400..c54d4577342 100644
--- a/pkgs/os-specific/linux/rtl8814au/default.nix
+++ b/pkgs/os-specific/linux/rtl8814au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, kernel }:
+{ stdenv, fetchFromGitHub, kernel }:
 
 stdenv.mkDerivation rec {
   name = "rtl8814au-${kernel.version}-${version}";
diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix
index 07a9b06ae76..64e38b41a5f 100644
--- a/pkgs/os-specific/linux/service-wrapper/default.nix
+++ b/pkgs/os-specific/linux/service-wrapper/default.nix
@@ -1,4 +1,4 @@
-{ lib, runCommand, substituteAll, fetchurl, systemd, coreutils }:
+{ lib, runCommand, substituteAll, coreutils }:
 
 let
   name = "service-wrapper-${version}";
diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix
index 4491bb7bf93..42b5317d556 100644
--- a/pkgs/os-specific/linux/seturgent/default.nix
+++ b/pkgs/os-specific/linux/seturgent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, xproto, xdotool, unzip }:
+{ stdenv, fetchurl, libX11, xproto, unzip }:
 
 stdenv.mkDerivation {
   name = "seturgent-2012-08-17";
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 99e4b09f46d..0a55608af96 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgs, lib, glibc, augeas, dnsutils, c-ares, curl,
+{ stdenv, fetchurl, pkgs, glibc, augeas, dnsutils, c-ares, curl,
   cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen,
   python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap,
   pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
-  libuuid, docbook_xsl, ldap, systemd, nspr, check, cmocka, uid_wrapper,
-  nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson
+  libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper,
+  nss_wrapper, ncurses, Po4a, http-parser, jansson
   , withSudo ? false }:
 
 let
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 6223c967619..cdb1910d9c0 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}:
+{stdenv, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 307ba9f43fa..abb6efa29bf 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
-, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
+, xz, pam, acl, libuuid, m4, utillinux, libffi
 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
 , audit, lz4, bzip2, libmicrohttpd, pcre2
 , linuxHeaders ? stdenv.cc.libc.linuxHeaders
 , iptables, gnu-efi
-, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
+, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 , ninja, meson, python3Packages, glibcLocales
 , patchelf
 , getent
diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
index 291666c0b45..fec70e8c485 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }:
+{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }:
 let
 
   media = fetchFromGitHub rec {
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix
index 9d919aaaa93..ac687de8c9a 100644
--- a/pkgs/os-specific/linux/thunderbolt/default.nix
+++ b/pkgs/os-specific/linux/thunderbolt/default.nix
@@ -4,7 +4,6 @@
 , fetchFromGitHub
 , pkgconfig
 , txt2tags
-, udev
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
index 4c3a92cd87e..46b09dce437 100644
--- a/pkgs/os-specific/linux/trinity/default.nix
+++ b/pkgs/os-specific/linux/trinity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, linuxHeaders }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "trinity-${version}";
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 9f65d0a0316..65c995558a4 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -2,7 +2,7 @@
 , gnome3, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash
 , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted
 , gobjectIntrospection, docbook_xml_dtd_412, docbook_xml_dtd_43
-, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, udftools, ntfs3g
+, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g
 }:
 
 let
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 1e9101b68af..c4af0bec9a2 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus-glib
+{ stdenv, fetchurl, pkgconfig, dbus-glib
 , intltool, libxslt, docbook_xsl, udev, libgudev, libusb1
 , useSystemd ? true, systemd, gobjectIntrospection
 }:
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 9ec6c22d32a..35f32b0afdd 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow
+{ lib, stdenv, fetchurl, pkgconfig, zlib, shadow
 , ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
 
 let
diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix
index 72d7690d2f8..9e2dee099ce 100644
--- a/pkgs/os-specific/linux/virtualbox/default.nix
+++ b/pkgs/os-specific/linux/virtualbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, virtualbox, kernel, strace }:
+{ stdenv, virtualbox, kernel }:
 
 stdenv.mkDerivation {
   name = "virtualbox-modules-${virtualbox.version}-${kernel.version}";
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 42982d49ce8..8f9a565ecc7 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, kernel, wireguard-tools }:
+{ stdenv, kernel, wireguard-tools }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
 assert stdenv.lib.versionAtLeast kernel.version "3.10";
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 7b421aaff3d..add7c648856 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, lib, openssl, pkgconfig, libnl
+{ stdenv, fetchurl, openssl, pkgconfig, libnl
 , dbus, readline ? null, pcsclite ? null
 }:
 
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index 06a38b29166..f4ef1b1498f 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
+{ stdenv, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
 
 stdenv.mkDerivation {
   name = "wpa_gui-${wpa_supplicant.version}";
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index b5937dff375..e0e211642af 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender
+, inputproto, libX11, libXext, libXi, libXrandr, libXrender
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index ef42dadc297..7cd414a97b0 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, mingw_header, hostPlatform, buildPlatform }:
+{ fetchurl, stdenv, hostPlatform, buildPlatform }:
 
 # This file is tweaked for cross-compilation only.
 assert hostPlatform != buildPlatform;
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 4cc187846d0..22a9aef8eda 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand
+{ stdenv, fetchurl
 , erlang, python, libxml2, libxslt, xmlto
 , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync
 , AppKit, Carbon, Cocoa
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index b1d60d8c145..b2b681bcc8b 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn, fetchpatch,
+{ stdenv, lib, fetchurl, fetchsvn,
   jansson, libxml2, libxslt, ncurses, openssl, sqlite,
   utillinux, dmidecode, libuuid, newt,
   lua, speex,
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 548d01c249d..ee403ab49f0 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "caddy-${version}";
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index 90c87f8019d..8335e40de98 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchurl, zip, unzip, makeWrapper
+{ stdenv, lib, fetchurl, zip, unzip
 , jzmq, jdk, python
-, logsDir ? "", confFile ? "", extraLibraryPaths ? [], extraJars ? [] }:
+, confFile ? "", extraLibraryPaths ? [], extraJars ? [] }:
 
 stdenv.mkDerivation rec {
   name = "apache-storm-" + version;
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index d2ad5d0bd8e..5cf19279100 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, consul-ui, fetchFromGitHub }:
+{ stdenv, buildGoPackage, consul-ui, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "consul-${version}";
diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix
index 13a78d61098..8a1bb6313ad 100644
--- a/pkgs/servers/dict/dictd-wordnet.nix
+++ b/pkgs/servers/dict/dictd-wordnet.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchsvn, python, wordnet, writeScript}:
+{stdenv, python, wordnet, writeScript}:
 
 stdenv.mkDerivation rec {
   version = "542";
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index bfa610b57d8..90cbc6cec55 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -2,7 +2,7 @@
 , knot-dns, luajit, libuv, lmdb, gnutls, nettle
 , cmocka, systemd, dns-root-data, makeWrapper
 , extraFeatures ? false /* catch-all if defaults aren't enough */
-, hiredis, libmemcached, luajitPackages
+, luajitPackages
 }:
 let # un-indented, over the whole file
 
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 2c82b0bf33a..1ac1d394894 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, libevent, openssl
+{ stdenv, fetchurl, libevent, openssl
 , bind8Stats       ? false
 , checking         ? false
 , ipv6             ? true
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index 29cb8c2223c..d6b71f81608 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }:
+{ lib, libpcap, buildGoPackage, fetchFromGitHub }:
 
 with lib;
 
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
index c1234606291..5e2381ada1d 100644
--- a/pkgs/servers/exhibitor/default.nix
+++ b/pkgs/servers/exhibitor/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, buildMaven, maven, jdk, makeWrapper, stdenv, ... }:
+{ fetchFromGitHub, maven, jdk, makeWrapper, stdenv, ... }:
 stdenv.mkDerivation rec {
   name = "exhibitor-${version}";
   version = "1.5.6";
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 24ed1dffd4d..caf7d8360f0 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libedit, ncurses, automake, autoconf, libtool
+{stdenv, fetchurl, libedit, automake, autoconf, libtool
 ,
   # icu = null: use icu which comes with firebird
 
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix
index 89f1821981f..ebade244bdf 100644
--- a/pkgs/servers/gotty/default.nix
+++ b/pkgs/servers/gotty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gotty-${version}";
diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix
index fc9d4c0508e..c4be1f3c3b3 100644
--- a/pkgs/servers/h2/default.nix
+++ b/pkgs/servers/h2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, jre, makeWrapper, unzip }:
+{ stdenv, fetchzip, jre, makeWrapper }:
 stdenv.mkDerivation rec {
   name = "h2-${version}";
 
diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix
index dcd81fa44b0..6a33ac638d2 100644
--- a/pkgs/servers/hbase/default.nix
+++ b/pkgs/servers/hbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
+{ stdenv, fetchurl, makeWrapper }:
 stdenv.mkDerivation rec {
   name = "hbase-${version}";
   version = "0.98.24";
diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix
index 49313179503..d921eee49cf 100644
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@@ -1,4 +1,4 @@
-{ lib, python3, fetchpatch }:
+{ lib, python3 }:
 
 let
   python = python3.override {
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 43334819dc5..5a873c7e84b 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python
+{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man
 , sphinx, which, file, pkgconfig, getopt }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix
index dbc5c73414c..fd2dec44c7f 100644
--- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix
+++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, jboss, mysql_jdbc }:
+{ stdenv, mysql_jdbc }:
 
 stdenv.mkDerivation {
   name = "jboss-mysql-jdbc";
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 44869593003..643e7ed719a 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
+{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt
 , gd, geoip
 , withDebug ? false
 , withStream ? true
 , withMail ? false
 , modules ? []
-, hardening ? true
 , version, sha256, ...
 }:
 
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 1f6fcc31943..0910a6d0584 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, fetchurl, lib, pkgs }:
+{ fetchFromGitHub, lib, pkgs }:
 
 {
   brotli = {
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index 33801c8cd32..479c9e41aa9 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl
+{stdenv
 , coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl
 , lighttpd, iproute }:
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 1155bac7570..1fe48e84fac 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt,
+{ stdenv, fetchurl, openssl, zlib, pcre, postgresql, libxml2, libxslt,
 gd, geoip, perl }:
 
 with stdenv.lib;
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index 0df055f9690..f57c94cd108 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, sudo, coreutils, systemd, cryptsetup
+{ sudo, coreutils, systemd, cryptsetup
 , mount, umount
 , buildGoPackage, fetchFromGitHub }:
 
diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix
index 5aafe55512b..9e8a9dc9ec6 100644
--- a/pkgs/servers/isso/default.nix
+++ b/pkgs/servers/isso/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python2, fetchurl, fetchFromGitHub }:
+{ stdenv, python2, fetchFromGitHub }:
 
 let python = python2.override {
   packageOverrides = self: super: {
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 6826df5f6e8..4276a51715a 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, pam, nspr, nss, openldap
+{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap
 , db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
 }:
 let
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index e676246a08e..5a9d8e61b1f 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, perl, pkgconfig, systemd, openssl
+{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl
 , bzip2, zlib, lz4, inotify-tools, pam, libcap
 , clucene_core_2, icu, openldap, libsodium, libstemmer
 # Auth modules
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
index f11400c190a..98b270ad7d4 100644
--- a/pkgs/servers/mail/mlmmj/default.nix
+++ b/pkgs/servers/mail/mlmmj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
 
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 302aa8d5593..8c86cc6577a 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub, fetchpatch }:
+{ stdenv, pythonPackages, fetchurl, fetchFromGitHub }:
 let
   matrix-angular-sdk = pythonPackages.buildPythonPackage rec {
     name = "matrix-angular-sdk-${version}";
diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix
index 53c87745e67..fe1f1c6760d 100644
--- a/pkgs/servers/mesos-dns/default.nix
+++ b/pkgs/servers/mesos-dns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "mesos-dns-${version}";
diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/servers/mirrorbits/default.nix
index 98ac1534cf8..10c8811c548 100644
--- a/pkgs/servers/mirrorbits/default.nix
+++ b/pkgs/servers/mirrorbits/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch
+{ lib, buildGoPackage, fetchFromGitHub, fetchpatch
 , pkgconfig, zlib, geoip }:
 
 buildGoPackage rec {
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 0480d056c59..0e256d907dc 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, fetchFromGitHub }:
+{ stdenv, go, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "cadvisor-${version}";
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix
index 646a7856788..a888549bb6a 100644
--- a/pkgs/servers/monitoring/consul-alerts/default.nix
+++ b/pkgs/servers/monitoring/consul-alerts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "consul-alerts-${version}";
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix
index 34b4e87bf65..96eaa5ef0cc 100644
--- a/pkgs/servers/monitoring/fusion-inventory/default.nix
+++ b/pkgs/servers/monitoring/fusion-inventory/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, gnused, nix, dmidecode, pciutils, usbutils, iproute, nettools
+{ stdenv, lib, fetchurl, buildPerlPackage, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
 , fetchFromGitHub, makeWrapper
 }:
 
diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix
index 409801e8b7d..0e21069bbb0 100644
--- a/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/pkgs/servers/monitoring/kapacitor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   name = "kapacitor-${version}";
diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix
index 859849f7b2c..af5f2880a0f 100644
--- a/pkgs/servers/monitoring/lcdproc/default.nix
+++ b/pkgs/servers/monitoring/lcdproc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig
-, doxygen, freetype, libX11, libftdi, libftdi1, libusb, libusb1, ncurses, perl }:
+, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }:
 
 stdenv.mkDerivation rec {
   name = "lcdproc-${version}";
diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index 957aee43691..5d93f4c5349 100644
--- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix
+++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper
+{ stdenv, fetchFromGitHub, fetchurl, autoreconfHook, makeWrapper
 , perl, DBDsybase, NetSNMP, coreutils, gnused, gnugrep }:
 
 let
diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 798f31c3458..1f342adebaa 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "blackbox_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
index 2bd9b6af074..0d6fbac60e5 100644
--- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "collectd-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
index 2e7a4932de6..1271b3d40e1 100644
--- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "fritzbox-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index ea17c0b18b2..ffba472bdc3 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchFromGitHub, lib }:
+{ buildGoPackage, fetchFromGitHub, lib }:
 
 buildGoPackage rec {
   name = "prometheus-json-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
index 42ff2496df1..ade9bb87d99 100644
--- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "mesos_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
index 59314f1f282..8b6c54d41f9 100644
--- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
   name = "minio-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 788fe863396..5e4ebb58140 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "prom2json-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index 9692354ad8a..29454dd44d2 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, net_snmp }:
+{ stdenv, buildGoPackage, fetchFromGitHub, net_snmp }:
 
 buildGoPackage rec {
   name = "snmp_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
index f4d9f5a8503..e5480e02037 100644
--- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "statsd_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
index 13e17d0b019..0c5cc626765 100644
--- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "surfboard_exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
index 44a670b95ab..18fa3f98db2 100644
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "unifi-exporter-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index d83aa5b4665..b23270cd8c1 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }:
+{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }:
 
 buildGoPackage rec {
   name = "prometheus_varnish_exporter-${version}";
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index d3816cf1ecd..9f1a2baeb9a 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext
+{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib
 , enableJabber ? false, minmay ? null }:
 
 assert enableJabber -> minmay != null;
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix
index bc5556d4bc0..bf3849e6524 100644
--- a/pkgs/servers/monitoring/zabbix/2.2.nix
+++ b/pkgs/servers/monitoring/zabbix/2.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext
+{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib
 , net_snmp , libssh2, openldap
 , enableJabber ? false, minmay ? null
 , enableSnmp ? false
diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix
index 69b3577720f..047ce0a5130 100644
--- a/pkgs/servers/monitoring/zabbix/3.4.nix
+++ b/pkgs/servers/monitoring/zabbix/3.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }:
+{ stdenv, fetchurl, pcre, libiconv }:
 
 
 let
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 35637e7f73a..f8523e8607d 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, systemd, boost, darwin
 , alsaSupport ? true, alsaLib
 , avahiSupport ? true, avahi, dbus
 , flacSupport ? true, flac
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 0121d748129..3d6a1aa9c6f 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 9b21deecf4b..f3d3fed23a4 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, openssl, zlib, python2Packages, readline, cmake, python }:
+, openssl, zlib, readline, cmake, python }:
 
 let
 in stdenv.mkDerivation rec {
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index f97a3a5c184..1d3240fae71 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8 }:
+{ stdenv, fetchFromGitHub, git, mono, v8 }:
 
 # There are some similarities with the pinta derivation. We should
 # have a helper to make it easy to package these Mono apps.
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index b9e850e8dfd..c62ade1a20b 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy
-, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security
+, zlib, libyamlcpp, sasl, openssl, libpcap, Security
 }:
 
 # Note:
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index e935b5d0987..d6ee407e341 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, m4, python
+{ stdenv, fetchurl, which, m4
 , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool
 , python2Packages, makeWrapper
 }:
diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix
index 9075756c162..cf807e70596 100644
--- a/pkgs/servers/nosql/riak-cs/2.1.1.nix
+++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak
+{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam
 , Carbon ? null, Cocoa ? null }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix
index a064049072c..1524ca20700 100644
--- a/pkgs/servers/nosql/riak-cs/stanchion.nix
+++ b/pkgs/servers/nosql/riak-cs/stanchion.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak 
+{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam 
 , Carbon ? null, Cocoa ? null }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix
index e4c9b90ab14..b041aa9f35f 100644
--- a/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/pkgs/servers/nosql/riak/2.2.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }:
+{ stdenv, lib, fetchurl, unzip, erlang, which, pam }:
 
 let
   solrName = "solr-4.10.4-yz-2.tgz";
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix
index fa78c876c1e..d48587c924e 100644
--- a/pkgs/servers/nsq/default.nix
+++ b/pkgs/servers/nsq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "nsq-${version}";
diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix
index 3f92299c2a0..22f09994ebf 100644
--- a/pkgs/servers/openafs/1.6/default.nix
+++ b/pkgs/servers/openafs/1.6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
 , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
 , ncurses # Extra ncurses utilities. Only needed for debugging.
 , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index 59c15839b39..fc6b1bc2426 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc
+{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
 , glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
 , libtool_2, removeReferencesTo
 , ncurses # Extra ncurses utilities. Only needed for debugging.
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index ed4a8889c67..73af65ef256 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -5,9 +5,6 @@
 , sbc, bluez5, udev, openssl, fftwFloat
 , speexdsp, systemd, webrtc-audio-processing, gconf ? null
 
-# Database selection
-, tdb ? null, gdbm ? null
-
 , x11Support ? false
 
 , useSystemd ? true
diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix
index 230e0aee218..04d520b412c 100644
--- a/pkgs/servers/rippled/data-api.nix
+++ b/pkgs/servers/rippled/data-api.nix
@@ -1,4 +1,4 @@
-{ lib, fetchgit, fetchurl, nodePackages }:
+{ lib, fetchgit, nodePackages }:
 
 with lib;
 
diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix
index 6f5bb1d3a71..87f4326c48c 100644
--- a/pkgs/servers/rippled/package.nix
+++ b/pkgs/servers/rippled/package.nix
@@ -1,4 +1,4 @@
-{ self, fetchurl, fetchgit ? null, lib }:
+{ self, fetchurl ? null }:
 
 {
   by-spec."abbrev"."1" =
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 0ff7f88911f..eec80cb66bc 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,9 +1,9 @@
 { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
 , fetchpatch
-, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc
+, docbook_xml_dtd_42, readline, talloc
 , popt, iniparser, libbsd, libarchive, libiconv, gettext
 , krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
-, gnutls, libgcrypt, libgpgerror
+, gnutls
 , ncurses, libunwind, libibverbs, librdmacm, systemd
 
 , enableInfiniband ? false
diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix
index df1f9feb4de..21038a0f218 100644
--- a/pkgs/servers/samba/master.nix
+++ b/pkgs/servers/samba/master.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ fetchFromGitHub
 , samba4
 , nettle
 } :
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index ade2ea94453..b93d8c2203d 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -1,4 +1,4 @@
-{ pkgs,  stdenv, fetchurl, fetchFromGitHub, unzip, elasticsearch }:
+{ pkgs,  stdenv, fetchurl, unzip, elasticsearch }:
 
 with pkgs.lib;
 
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix
index ccb174371e0..7bfea23c78b 100644
--- a/pkgs/servers/skydns/default.nix
+++ b/pkgs/servers/skydns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "skydns-${version}";
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 126a8cf0690..121e42f7a97 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
 , libiconv, openssl, pcre, boost, judy, bison, libxml2
-, libaio, libevent, groff, jemalloc, cracklib, systemd, numactl, perl
+, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
 , asio, buildEnv, check, scons
 }:
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 9c133f9d5d9..3fc7aaea9c9 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, substituteAll, xterm, makeWrapper, ruby
-, openssl, quartz-wm, fontconfig, xlsfonts, xfontsel
+{ stdenv, lib, buildEnv, makeFontsConf, gnused, writeScript, xorg, bashInteractive, xterm, makeWrapper, ruby
+, quartz-wm, fontconfig, xlsfonts, xfontsel
 , ttf_bitstream_vera, freefont_ttf, liberation_ttf
 , shell ? "${bashInteractive}/bin/bash"
 }:
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 72ce29bf3f2..ab89dc28828 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -5,7 +5,6 @@
 # patch for cygwin requires readline support
 , interactive ? stdenv.isCygwin, readline70 ? null
 , withDocs ? false, texinfo ? null
-, self
 }:
 
 with stdenv.lib;
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 086fca480bb..5a7128fa646 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "elvish-${version}";
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index d6c107e9953..2ef0480942c 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coreutils, utillinux,
-  nettools, kbd, bc, which, gnused, gnugrep,
+  nettools, bc, which, gnused, gnugrep,
   groff, man-db, getent, libiconv, pcre2,
   gettext, ncurses, python3
 
diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix
index c118cea1172..2e200a74f7b 100644
--- a/pkgs/shells/oh/default.nix
+++ b/pkgs/shells/oh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "oh-${version}";
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index ab475a63499..8d3452b912b 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, coreutils }:
+{ stdenv, lib, fetchurl }:
 let
   version = "0.3.0";
 in
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index a053884bb88..93488d9e87f 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl,
+{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl,
   makeWrapper, less, openssl, pam, lttng-ust }:
 
 let platformString = if stdenv.isDarwin then "osx"
diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index 665f403047f..98ca9ce8f99 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "antibody-${version}";
diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
index 2babf35f2b6..30c45ea3c9b 100644
--- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zsh }:
+{ stdenv, fetchFromGitHub }:
 
 # To make use of this derivation, use
 # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel9k}/share/zsh-powerlevel9k/powerlevel9k.zsh-theme";`
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix
index 7bef904081e..8acdd8bb516 100644
--- a/pkgs/shells/zsh/zsh-prezto/default.nix
+++ b/pkgs/shells/zsh/zsh-prezto/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchgit, fetchFromGitHub }:
+{ stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   name = "zsh-prezto-2017-12-03";
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix
index 7345528dad2..0d764a4cbd1 100644
--- a/pkgs/tools/X11/bumblebee/default.nix
+++ b/pkgs/tools/X11/bumblebee/default.nix
@@ -18,15 +18,14 @@
 
 { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper
 , glib, libbsd
-, libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau
-, nvidia_x11, virtualgl, libglvnd, primusLib
+, libX11, xorgserver, kmod, xf86videonouveau
+, nvidia_x11, virtualgl, libglvnd
 , automake111x, autoconf
 # The below should only be non-null in a x86_64 system. On a i686
 # system the above nvidia_x11 and virtualgl will be the i686 packages.
 # TODO: Confusing. Perhaps use "SubArch" instead of i686?
 , nvidia_x11_i686 ? null
 , libglvnd_i686 ? null
-, primusLib_i686 ? null
 , useDisplayDevice ? false
 , extraNvidiaDeviceOptions ? ""
 , extraNouveauDeviceOptions ? ""
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index aeb4546ff4d..189dc56975f 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, xorg, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, xorg, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-sct-${version}";
diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix
index d130c9bac7c..669cb4b4844 100644
--- a/pkgs/tools/X11/primus/default.nix
+++ b/pkgs/tools/X11/primus/default.nix
@@ -6,7 +6,6 @@
 { stdenv
 , stdenv_i686
 , lib
-, bumblebee
 , primusLib
 , writeScriptBin
 , primusLib_i686 ? null
diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix
index 669da86621f..45cb1966a4f 100644
--- a/pkgs/tools/X11/setroot/default.nix
+++ b/pkgs/tools/X11/setroot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, libX11, imlib2
+{ stdenv, fetchFromGitHub, libX11, imlib2
 , enableXinerama ? true, libXinerama ? null
 }:
 
diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix
index 21d7a50566d..153ff45d2a7 100644
--- a/pkgs/tools/X11/vdpauinfo/default.nix
+++ b/pkgs/tools/X11/vdpauinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xorg, libvdpau }:
+{ stdenv, fetchurl, pkgconfig, libvdpau }:
 
 stdenv.mkDerivation rec {
   name = "vdpauinfo-1.0";
diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix
index e3d9ecd5953..987293878d8 100644
--- a/pkgs/tools/X11/xbindkeys-config/default.nix
+++ b/pkgs/tools/X11/xbindkeys-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, gtk, pkgconfig, procps, makeWrapper, ... }:
+{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
 
 stdenv.mkDerivation rec {
   name = "xbindkeys-config-${version}";
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 28839891aa5..d8ae32c6ee4 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub
 , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
-, w3m, which, gnugrep, gnused, coreutils, xset
+, w3m, gnugrep, gnused, coreutils, xset
 , mimiSupport ? false, gawk ? null }:
 
 assert mimiSupport -> gawk != null;
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 8bff5a2e714..e3f815621e7 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, python2Packages, pkgconfig
 , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
-, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
+, makeWrapper, xorgserver, getopt, xauth, utillinux, which
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama
 , gst_all_1, pulseaudio, gobjectIntrospection
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index a0c2ee8f995..16693b08e11 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPythonApplication
 , python, cython, pkgconfig
 , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection
-, makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf
+, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama, pam }:
 
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index b942ae6a006..d18fe4eafd3 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, python2
+{ stdenv, fetchurl, python2
 , windowsSupport ? false
 }:
 
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
index 38b70d1b5d0..c9c879becaa 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
+{ stdenv, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
 let
   pkgName = "dehydrated";
   version = "0.6.2";
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index 59a5ec8d4da..cd6cf90a5aa 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gobjectIntrospection
-, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
+, gnutls, cairo, libtool, glib, pkgconfig
 , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
-, kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_32
+, libgcrypt, gtk3, vala_0_32
 , libogg, libgpgerror, pythonPackages }:
 
 let
diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
index 2b663cd3bce..780eb4e9aa5 100644
--- a/pkgs/tools/admin/intecture/agent.nix
+++ b/pkgs/tools/admin/intecture/agent.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform
+{ lib, fetchFromGitHub, rustPlatform
 , openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
 
 with rustPlatform;
diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
index 759230c6a29..2a02873a8b5 100644
--- a/pkgs/tools/admin/intecture/auth.nix
+++ b/pkgs/tools/admin/intecture/auth.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform
+{ lib, fetchFromGitHub, rustPlatform
 , openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
 
 with rustPlatform;
diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
index a4ac74e9f2d..fef0e50cd5b 100644
--- a/pkgs/tools/admin/intecture/cli.nix
+++ b/pkgs/tools/admin/intecture/cli.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform
+{ lib, fetchFromGitHub, rustPlatform
 , openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
 
 with rustPlatform;
diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index dfe4c099beb..2fbfff287cb 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl
+{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl
 , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
 , squashfsTools, iproute, iptables, ebtables
 }:
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 47bf848578d..ca0e16c1185 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, bash }:
+{ stdenv, pythonPackages, bash }:
  
 pythonPackages.buildPythonApplication rec {
   pname = "simp_le-client";
diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix
index 8d30307af2d..f8e89307815 100644
--- a/pkgs/tools/admin/ssl-cert-check/default.nix
+++ b/pkgs/tools/admin/ssl-cert-check/default.nix
@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchFromGitHub
 , makeWrapper
 , openssl
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
index 14b128d15c7..dc9796cc9e3 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, doxygen, makeWrapper, python
+{ stdenv, fetchurl, cmake, makeWrapper, python
 , boost, lzma
 , withGog ? false, unar ? null }:
 
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix
index c9ce6ac4d10..8d4d5fd8ddd 100644
--- a/pkgs/tools/archivers/rpmextract/default.nix
+++ b/pkgs/tools/archivers/rpmextract/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rpm, cpio, substituteAll }:
+{ stdenv, rpm, cpio, substituteAll }:
 
 stdenv.mkDerivation rec {
   name = "rpmextract";
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix
index 7583663ebf0..79c8e2f20ec 100644
--- a/pkgs/tools/archivers/unp/default.nix
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }:
+{ stdenv, lib, fetchurl, makeWrapper, perl, unrar, unzip, gzip, file, extraBackends ? [] }:
 
 stdenv.mkDerivation rec {
   name = "unp-${version}";
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 3004c7e2132..0d60e796246 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip
-, buildPlatform, hostPlatform
+, hostPlatform
 }:
 
 let
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 691568673df..e93b02e062e 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex
+{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
 , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
 , sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
 , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
diff --git a/pkgs/tools/backup/ddar/default.nix b/pkgs/tools/backup/ddar/default.nix
index eac589813f4..ce65ef4eb80 100644
--- a/pkgs/tools/backup/ddar/default.nix
+++ b/pkgs/tools/backup/ddar/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonApplication, fetchFromGitHub, python, protobuf, roundup }:
+{ lib, buildPythonApplication, fetchFromGitHub, protobuf, roundup }:
 
 buildPythonApplication rec {
   pname = "ddar";
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix
index c902802abce..8781c2d2cad 100644
--- a/pkgs/tools/backup/partimage/default.nix
+++ b/pkgs/tools/backup/partimage/default.nix
@@ -1,5 +1,4 @@
 {stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang
-, automake, autoconf, libtool, gettext
 }:
 stdenv.mkDerivation {
   name = "partimage-0.6.9";
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix
index 77f5951d39e..6abd7002f8d 100644
--- a/pkgs/tools/backup/rsnapshot/default.nix
+++ b/pkgs/tools/backup/rsnapshot/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, writeText, perl, openssh, rsync, logger }:
+{ fetchurl, stdenv, perl, openssh, rsync, logger }:
 
 stdenv.mkDerivation rec {
   name = "rsnapshot-1.4.2";
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix
index 00651806a10..8f93474f8f1 100644
--- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix
+++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix
@@ -1,6 +1,6 @@
 { pkgs, stdenv, eggDerivation, fetchegg }:
 let
-  eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; };
+  eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
 in with pkgs; eggDerivation rec {
   pname = "ugarit-manifest-maker";
   version = "0.1";
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
index 0af5dd5bfff..889d698188e 100644
--- a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
+++ b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, eggDerivation, fetchegg }:
+{ eggDerivation, fetchegg }:
 rec {
   blob-utils = eggDerivation {
     name = "blob-utils-1.0.3";
diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix
index 56da9a81020..e8f0ea22df1 100644
--- a/pkgs/tools/backup/ugarit/default.nix
+++ b/pkgs/tools/backup/ugarit/default.nix
@@ -1,6 +1,6 @@
 { pkgs, stdenv, eggDerivation, fetchegg }:
 let
-  eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; };
+  eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
 in with pkgs; eggDerivation rec {
   pname = "ugarit";
   version = "2.0";
diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/tools/backup/ugarit/eggs.nix
index 9329618887f..fe958cb55cc 100644
--- a/pkgs/tools/backup/ugarit/eggs.nix
+++ b/pkgs/tools/backup/ugarit/eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, eggDerivation, fetchegg }:
+{ eggDerivation, fetchegg }:
 rec {
   aes = eggDerivation {
     name = "aes-1.5";
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index f78c300afd0..bc57215c0c4 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
+{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }:
 
 let
   # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 394f3fe5b98..da562fde160 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
+{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, gtk3
 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
 , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection
 , withPulseAudio ? true, libpulseaudio }:
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 80add316094..674bb5b552b 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, gnu-efi }:
+{ stdenv, fetchurl, gnu-efi }:
 
 let
   archids = {
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index 8223ba2be4b..9587416a96a 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
-, libcanberra-gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs
+, libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs
 , vcdimager, wrapGAppsHook, hicolor-icon-theme }:
 
 # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 3a06a39dcad..0d2e63c7d59 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchurl
 , linkStatic ? (stdenv.system == "i686-cygwin")
 }:
 
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index c39216f1e0c..09065ede682 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, hostPlatform, fetchurl, xz }:
+{ stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
   name = "gzip-${version}";
diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix
index a38e0a67b28..df7700d41cb 100644
--- a/pkgs/tools/compression/lzbench/default.nix
+++ b/pkgs/tools/compression/lzbench/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glibc }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "lzbench-20170208";
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index 213d98a1ec1..ea363ae8cc2 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl }:
+{ stdenv, fetchurl, ucl, zlib, perl }:
 
 stdenv.mkDerivation rec {
   name = "upx-${version}";
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index c2e13b75daa..1fafe7412d8 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
+{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium
 , keyutils, liburcu, zlib, libaio, zstd }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 20eb363b227..14fedd6610e 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -9,7 +9,7 @@
 
 # Optional Dependencies
 , yasm ? null, fcgi ? null, expat ? null
-, curl ? null, fuse ? null, libibverbs ? null, librdmacm ? null
+, curl ? null, fuse ? null
 , libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null
 , libs3 ? null
 
@@ -25,7 +25,7 @@
 , zfs ? null
 
 # Version specific arguments
-, version, src, patches ? [], buildInputs ? []
+, version, src ? [], buildInputs ? []
 , ...
 }:
 
@@ -92,7 +92,7 @@ let
     ps.prettytable
     ps.webob
     ps.cherrypy
-	]);
+  ]);
 
 in
 stdenv.mkDerivation {
@@ -101,7 +101,7 @@ stdenv.mkDerivation {
   inherit src;
 
   patches = [
- #	 ./ceph-patch-cmake-path.patch
+ #   ./ceph-patch-cmake-path.patch
     ./0001-kv-RocksDBStore-API-break-additional.patch
   ] ++ optionals stdenv.isLinux [
     ./0002-fix-absolute-include-path.patch
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
index f929f354766..9af14b05126 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, parted, substituteAll, utillinux }:
+{ stdenv, fetchurl, parted, utillinux }:
 
 stdenv.mkDerivation rec {
   
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 494fd7036e2..beb046cdbdb 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,
  autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
- liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, python2Packages,
+ liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
  openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
  rsync, glibc
 }:
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix
index 028aef6024b..0438b9c38e4 100644
--- a/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/pkgs/tools/filesystems/go-mtpfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, libusb1, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, pkgconfig, libusb1, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "go-mtpfs-${version}";
diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix
index f4bb5592abd..4f7c2248a8e 100644
--- a/pkgs/tools/filesystems/grive2/default.nix
+++ b/pkgs/tools/filesystems/grive2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }:
+{ stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }:
 
 stdenv.mkDerivation rec {
   version = "0.5.0";
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index c2066f95ef5..24a88349bf4 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
+{ stdenv, fetchurl, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }:
 
 with stdenv;
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 217056117ea..758e130e4ad 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -1,8 +1,6 @@
 { stdenv, fetchurl, python, buildPythonApplication
 # Propagated to blivet
 , useNixUdev ? true
-# No longer needed, but kept for backwards-compatibility with older NixOps.
-, udevSoMajor ? null
 # Propagated dependencies
 , pkgs, urlgrabber
 }:
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix
index 341b025b079..b3d8d70f0e2 100644
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch, automake, autoreconfHook, libtool, fuse,
-  pkgconfig, pcre, lz4, xz, zlib, lzo, zstd }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse,
+  pkgconfig, lz4, xz, zlib, lzo, zstd }:
 
 with stdenv.lib;
 
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 2a85adb60b5..4c0c2343dd2 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python
-, fetchurl, lib, valgrind, makeWrapper, fetchFromGitHub }:
+, lib, valgrind, makeWrapper, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix
index 9dfb2deeaee..66e6690bc6a 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, zookeeper, zookeeper_mt, fuse, pkgconfig, autoreconfHook, log4cxx, boost, tree }:
+{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }:
 
 stdenv.mkDerivation rec {
   name = "zkfuse-${version}";
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix
index 7a06d9f346b..a3b25970351 100644
--- a/pkgs/tools/graphics/argyllcms/default.nix
+++ b/pkgs/tools/graphics/argyllcms/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
 , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
-, libXdmcp, libXau, lib, openssl, zlib }:
+, libXdmcp, libXau, lib, openssl }:
 let
   version = "2.0.0";
  in
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 0a48e947a48..cc899ab104f 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, patchelf, imagemagick }:
+{ stdenv, fetchurl, cmake, imagemagick }:
 
 stdenv.mkDerivation rec {
   name = "cuneiform-${version}";
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index 6c62e052838..c267695dd78 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig
+{ stdenv, fetchurl, cmake, ninja, pkgconfig
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
 , withGimpPlugin ? true, gimp ? null}:
 
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 0a4ebf495b2..d50adaa387f 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -2,7 +2,6 @@
 , cairo, gd, libcerf, pango, readline, zlib
 , withTeXLive ? false, texlive
 , withLua ? false, lua
-, emacs ? null
 , libX11 ? null
 , libXt ? null
 , libXpm ? null
diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix
index 0bb0bb00efa..393c18d3852 100644
--- a/pkgs/tools/graphics/jbig2enc/default.nix
+++ b/pkgs/tools/graphics/jbig2enc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
+{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
 
 stdenv.mkDerivation {
   name = "jbig2enc-0.28";
diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix
index 95f7c547b55..a83bc845eb9 100644
--- a/pkgs/tools/graphics/pywal/default.nix
+++ b/pkgs/tools/graphics/pywal/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }:
+{ lib, python3Packages, imagemagick, feh }:
 
 python3Packages.buildPythonApplication rec {
   pname = "pywal";
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index da63cb58a55..18699f41284 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, expat,
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat,
   fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif,
-  python27, libpng, matio ? null, cfitsio ? null, libwebp ? null
+  python27, libpng ? null
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
index 170ac4c6a26..d74c7608bc9 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
@@ -1,5 +1,5 @@
 { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja,
-  python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese,
+  python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb,
   fcitx, gettext }:
 let
   japanese_usage_dictionary = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index 50ab7d85c5a..166fd16811a 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules
+{ stdenv, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules
 , fetchpatch
 }:
 
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index c7d0eecb763..ab8a7bdb34d 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -2,7 +2,7 @@
 , libxml2, enchant, isocodes, icu, libpthreadstubs
 , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
 , dbus, gtk2, gtk3, qt4, extra-cmake-modules
-, xkeyboard_config, pcre, libuuid, curl, cacert
+, xkeyboard_config, pcre, libuuid
 , withPinyin ? true
 , fetchFromGitHub
 }:
diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix
index 1dfe6b24506..28a08e39b22 100644
--- a/pkgs/tools/inputmethods/fcitx/wrapper.nix
+++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }:
+{ symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }:
 
 symlinkJoin {
   name = "fcitx-with-plugins-${fcitx.version}";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index f70c7d02e9f..cb2076cd21c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig
-, gtk3, ibus, libhangul, librsvg, python3
+, gtk3, ibus, libhangul, python3
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index fd924cdd2a2..01b092ef2a6 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -1,5 +1,5 @@
 { clangStdenv, fetchFromGitHub, which, ninja, python, gyp, pkgconfig, protobuf
-, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }:
+, ibus, gtk2, zinnia, qt5, libxcb }:
 
 let
   japanese_usage_dictionary = fetchFromGitHub {
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index d3507b57cbd..540779477e3 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
-, vala, wrapGAppsHook, atk, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2
+, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2
 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true
 , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }:
 
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index 33c66fb7ff2..a6aed47d964 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, libyamlcpp,
+{ stdenv, fetchurl, pkgconfig, cmake, libyamlcpp,
   libevdev, udev }:
 
 let
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index ff146e60923..1044c0acc0a 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, pythonPackages }:
+{ stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   version = "1.3";
diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix
index fcdd9a81d72..5ead0e1020c 100644
--- a/pkgs/tools/misc/azure-vhd-utils/default.nix
+++ b/pkgs/tools/misc/azure-vhd-utils/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "azure-vhd-utils-${version}";
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index 41a50eecd84..d0434ebe28b 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "bibutils-${version}";
diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index c5ebe7cf32e..026c626ff77 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, python, perl, textual-window-manager }:
+{ stdenv, fetchurl, python, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
   version = "5.125";
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 4461834cb74..a5d71a9487c 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bash-completion
 , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus
 , gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_40
-, libgudev, sane-backends, udev, gnome3, makeWrapper }:
+, libgudev, sane-backends, gnome3, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "colord-1.4.2";
diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix
index 673e5c4c321..a8a878b1998 100644
--- a/pkgs/tools/misc/dashing/default.nix
+++ b/pkgs/tools/misc/dashing/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "dashing-unstable-${version}";
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 054822e6069..b3a654be04e 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
+{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils }:
 
 # USAGE like this: debootstrap sid /tmp/target-chroot-directory
 # There is also cdebootstrap now. Is that easier to maintain?
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index e22bce7c698..508fc77a9a0 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, bash, writeText}:
+{ stdenv, fetchFromGitHub, buildGoPackage, bash}:
 
 buildGoPackage rec {
   name = "direnv-${version}";
diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index f34d05758cf..aa23b51f4b8 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cargo, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   name = "dust-${version}";
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix
index 8219d110f2e..c9ee511ff83 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/pkgs/tools/misc/fluentd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby, curl }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   inherit ruby;
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 0f6fb38ef3b..04717974a8b 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, lib
+{ stdenv, fetchFromGitHub, lib
 , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
 , withSpiro ? false, libspiro
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index ba85c5376db..e8e2152f711 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, writeText }:
+{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText }:
 
 buildGoPackage rec {
   name = "fzf-${version}";
diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix
index 84d3239729f..990282b2d58 100644
--- a/pkgs/tools/misc/gams/default.nix
+++ b/pkgs/tools/misc/gams/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, lib, file, licenseFile, optgamsFile}:
+{ stdenv, fetchurl, unzip, file, licenseFile, optgamsFile}:
 
 assert licenseFile != null;
 
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
index 7c944ceaab3..c187b09624a 100644
--- a/pkgs/tools/misc/gawp/default.nix
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 with builtins;
 
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index 24841a2bac7..a5871d2bc33 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 let
   goPackagePath = "github.com/github/gh-ost";
diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix
index 1c1fb05050f..d7c10220f4b 100644
--- a/pkgs/tools/misc/gosu/default.nix
+++ b/pkgs/tools/misc/gosu/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gosu-${version}";
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index 21a624c9d25..3f476cfea94 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -1,4 +1,4 @@
-{ pkgs,  stdenv, fetchurl, fetchFromGitHub, unzip, graylog }:
+{ pkgs,  stdenv, fetchurl, unzip, graylog }:
 
 with pkgs.lib;
 
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 58c9f18ec5a..63511782f00 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake
+{ stdenv, fetchurl, flex, bison, python
 , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig
 , fuse # only needed for grub-mount
 , zfs ? null
diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix
index 14c8ca23433..17b48ad8741 100644
--- a/pkgs/tools/misc/hdf5/1_8.nix
+++ b/pkgs/tools/misc/hdf5/1_8.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, gcc
 , removeReferencesTo
 , cpp ? false
 , gfortran ? null
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 494616d2b48..31813c0b880 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, gcc
 , removeReferencesTo
 , cpp ? false
 , gfortran ? null
diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index 03af224b4c0..82801da322c 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ant, javac, hdf_java }:
+{ stdenv, fetchurl, ant, javac, hdf_java }:
 
 stdenv.mkDerivation rec {
   name = "hdfview-${version}";
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
index 52e7793d974..7035f2ecedf 100644
--- a/pkgs/tools/misc/i3cat/default.nix
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "i3cat-${version}";
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
index 8d55b2cdc00..eb3b6aa11e6 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, libbitcoin, libbitcoin-protocol }:
 
 let
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
index e49614834ae..d0395ecbd7f 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, libbitcoin-client, libbitcoin-network }:
 
 let
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
index c17c99980a8..cb9e2cbf1e8 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, libbitcoin, zeromq }:
 
 let
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
index fbfcfc10074..2c13927dfad 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, libbitcoin, secp256k1, zeromq }:
 
 let
diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
index f8910f83ec5..18177c0a7e3 100644
--- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix
+++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , boost, secp256k1 }:
 
 let
diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix
index 085e6f41a09..e2ff4868c9e 100644
--- a/pkgs/tools/misc/massren/default.nix
+++ b/pkgs/tools/misc/massren/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "massren-${version}";
diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix
index c6f9f4749b3..1d3a355dd95 100644
--- a/pkgs/tools/misc/mmake/default.nix
+++ b/pkgs/tools/misc/mmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "mmake-${version}";
diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 7dbfc90fa12..a076a405ce7 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix
index 267b458cccc..be96dd9d3d3 100644
--- a/pkgs/tools/misc/pal/default.nix
+++ b/pkgs/tools/misc/pal/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, glib, gettext, readline, pkgconfig }:
+{stdenv, fetchurl, glib, gettext, readline, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "pal-0.4.3";
diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix
index 260d96a981f..52e704eb52e 100644
--- a/pkgs/tools/misc/papis/default.nix
+++ b/pkgs/tools/misc/papis/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonApplication, lib, fetchFromGitHub, bashInteractive
+{ lib, fetchFromGitHub, bashInteractive
 , python3, vim
 }:
 
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 38cab5cf862..69b60ae0997 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, fetchFromGitHub, fetchurl, lib,
+  mkDerivation, fetchFromGitHub, lib,
   extra-cmake-modules, kdoctools, wrapGAppsHook,
   baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework
 }:
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index f39ee734d81..c320f8ef5f6 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, perl, wineStaging
+{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, wineStaging
  }:
 
 let
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index 670f7067765..c1b99b31567 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rsync, glibc, gawk }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   version = "5.53";
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index c6fdf0a5120..a43335626ac 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
+{ stdenv, fetchurl, qtbase, qttools, qmake }:
 
 let inherit (stdenv.lib) getDev; in
 
diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index f1712a43c3b..a1fa7dee083 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gettext, emacs, curl, check, bc }:
+{ fetchurl, stdenv, emacs, curl, check, bc }:
 
 stdenv.mkDerivation rec {
   name = "recutils-1.7";
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 668a3fd5c99..082eb6879c4 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, skalibs, gcc }:
+{ stdenv, fetchurl, skalibs }:
 
 with stdenv.lib;
 
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index f0abb38706b..9ba61221684 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, pythonPackages, perl, zip
-, rtmpdump, substituteAll }:
+, rtmpdump }:
 
 let
   inherit (pythonPackages) python nose pycrypto requests mock;
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 9d12fa254d4..a58eb315638 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,10 +1,9 @@
 { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
-, makeWrapper, gtk3, docbook_xml_dtd_412, docbook_xsl
+, docbook_xml_dtd_412, docbook_xsl
 , libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify
 , gobjectIntrospection, libsecret
 , cups-filters
 , pythonPackages
-, withGUI ? true
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix
index b9c93c63954..0ad683bd652 100644
--- a/pkgs/tools/misc/t/default.nix
+++ b/pkgs/tools/misc/t/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv {
   name = "t-3.1.0";
diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index 1f50eef0ed0..be6a5070d61 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildRubyGem, makeWrapper, ruby }:
+{ lib, buildRubyGem, ruby }:
 
 # Cannot use bundleEnv because bundleEnv create stub with
 # BUNDLE_FROZEN='1' environment variable set, which broke everything
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 3932e06192e..dd0fb4de702 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, python }:
 
 with python.pkgs;
 
diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix
index 10e481b7664..2729f6f8859 100644
--- a/pkgs/tools/misc/toilet/default.nix
+++ b/pkgs/tools/misc/toilet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libcaca, figlet }:
+{ stdenv, fetchurl, pkgconfig, libcaca }:
 
 stdenv.mkDerivation rec {
   name = "toilet-${version}";
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 113c7e127d4..7ae871afc78 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, coreutils
-, python3, python3Packages, substituteAll }:
+, python3Packages, substituteAll }:
 
 python3Packages.buildPythonApplication rec {
   name = "trash-cli-${version}";
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
index ff8e7873839..7751e03df19 100644
--- a/pkgs/tools/misc/upower-notify/default.nix
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
 #
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 25687a3dbe1..48edb601a43 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison
+{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
 , flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline
 , python3
 , svfSupport ? false
diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index 2b801bb74a4..b1704c3b46c 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub }:
+{ stdenv, rustPlatform, fetchFromGitHub }:
 
 with rustPlatform;
 
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index 80a728747fe..e03f84355ca 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -1,6 +1,6 @@
 { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs
 , fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool
-, libuuid, libxfs, lvm2, openssl, perl, procps, quota, su
+, libuuid, libxfs, lvm2, openssl, perl, procps, quota
 , time, utillinux, which, writeScript, xfsprogs }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 80135f4ab44..c4cfc00308e 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt
+{ stdenv, fetchurl, makeWrapper, xorgserver, getopt
 , xauth, utillinux, which, fontsConf, gawk, coreutils }:
 let
   xvfb_run = fetchurl {
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 90489e126fa..be6bacd3b21 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, targetPlatform, fetchurl, buildPythonPackage
+{ lib, fetchurl, buildPythonPackage
 , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
 # Pandoc is required to build the package's man page. Release tarballs contain a
 # formatted man page already, though, it will still be installed. We keep the
diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix
index 528f9aecb54..acc0bac04ff 100644
--- a/pkgs/tools/misc/yubikey-neo-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, python27Packages
+{ stdenv, fetchurl, python27Packages
 , libykneomgr, yubikey-personalization, libu2f-host }:
 
 python27Packages.buildPythonPackage rec {
diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix
index 492b72a176e..589e6717c7d 100644
--- a/pkgs/tools/misc/zsh-autoenv/default.nix
+++ b/pkgs/tools/misc/zsh-autoenv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, bash }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "zsh-autoenv-${version}";
diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix
index 93535e935dc..6f6009c107b 100644
--- a/pkgs/tools/networking/airfield/default.nix
+++ b/pkgs/tools/networking/airfield/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, callPackage, python, utillinux
+{ stdenv, fetchFromGitHub
 , pkgs, makeWrapper, buildEnv
 , nodejs
 }:
diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix
index e5c2aace400..8b9d1e3b704 100644
--- a/pkgs/tools/networking/argus/default.nix
+++ b/pkgs/tools/networking/argus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers,
-  pkgconfig, procps, which, wget, lsof, net_snmp, bash, perl }:
+  pkgconfig, procps, which, wget, lsof, net_snmp, perl }:
 
 stdenv.mkDerivation rec {
   pname = "argus";
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 7af7a8f551d..7904ffb0d04 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub, openssh, makeWrapper }:
 
 buildGoPackage rec {
   name = "assh-${version}";
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index 1d9e2e1677f..e20d62d1f07 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, libX11 }:
+{ stdenv, fetchFromGitHub, qmake, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "cmst-${version}";
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index f6e0608ca7f..e960f8c3a84 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, openconnect, file, gawk,
+{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk,
   openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
   wpa_supplicant, readline6, pptp, ppp }:
 
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 1038882573b..ff4a24fb781 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pythonPackages
-, sysstat, unzip, makeWrapper }:
+, unzip, makeWrapper }:
 let
   inherit (pythonPackages) python;
   docker_1_10 = pythonPackages.buildPythonPackage rec {
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index be14db79880..9adb95d1d3f 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, dbus, nettle
-, libidn, libnetfilter_conntrack, fetchpatch }:
+, libidn, libnetfilter_conntrack }:
 
 with stdenv.lib;
 let
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 732051d8ec7..e440d35e821 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 with lib;
 
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index c7d7b5ec6df..12f68af7d0a 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , boost, zlib, openssl
 , upnpSupport ? true, miniupnpc ? null
 , aesniSupport ? false
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 9d588f6fa5e..2bd76188a63 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
 , gnutls, libite, libconfuse }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index f28c75774db..c66218c4898 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, getopt, ip2location-c, openssl, perl
-, geoip ? null, geolite-legacy ? null
-, ip2location-database ? null }:
+, geoip ? null, geolite-legacy ? null }:
 
 stdenv.mkDerivation rec {
   name = "ipv6calc-${version}";
diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix
index 425e531419e..a7648fd59c3 100644
--- a/pkgs/tools/networking/maxscale/default.nix
+++ b/pkgs/tools/networking/maxscale/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, gcc, glibc
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, glibc
 , bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, mariadb
 , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl
 , libaio, libedit, libtool, libui, libuuid, zlib
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 85c285fd3ec..62c9e7b63d1 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -2,7 +2,7 @@
 , systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables
 , libgcrypt, dnsmasq, bluez5, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
-, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
+, ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
 , python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }:
 
 let
diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu.nix
index 82810e714d5..93827eebb57 100644
--- a/pkgs/tools/networking/network-manager/dmenu.nix
+++ b/pkgs/tools/networking/network-manager/dmenu.nix
@@ -1,5 +1,5 @@
 { stdenv, glib, fetchFromGitHub, networkmanager, python3Packages
-, gobjectIntrospection, dmenu }:
+, gobjectIntrospection }:
 
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn.nix b/pkgs/tools/networking/network-manager/fortisslvpn.nix
index 73aaea06c91..54046a23b7d 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig,
-networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
+networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:
 
 let
   pname   = "NetworkManager-fortisslvpn";
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index 2eef7f31ab5..28b7c873d36 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret
-, withGnome ? true, gnome3, procps, kmod }:
+, withGnome ? true, gnome3, kmod }:
 
 let
   pname   = "NetworkManager-openvpn";
diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix
index e354ad223b8..26bcc8f803f 100644
--- a/pkgs/tools/networking/ngrok-1/default.nix
+++ b/pkgs/tools/networking/ngrok-1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }:
+{ buildGoPackage, go-bindata, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "ngrok-${version}";
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 46c0ee0f276..04a77176682 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook
+{ stdenv, fetchurl, fetchpatch, zlib, openssl, libedit, pkgconfig, pam, autoreconfHook
 , etcDir ? null
 , hpnSupport ? false
 , withKerberos ? true
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
index a13d6599ffb..3814af60112 100644
--- a/pkgs/tools/networking/s3gof3r/default.nix
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "s3gof3r-${version}";
diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
index d2e8a9a3051..09fa69dd37c 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, cmake
+{ stdenv, fetchgit, cmake
 , libsodium, mbedtls, libev, c-ares, pcre
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix
index ce2a8cf6a7f..e7214793744 100644
--- a/pkgs/tools/networking/skydive/default.nix
+++ b/pkgs/tools/networking/skydive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl
+{ lib, buildGoPackage, fetchFromGitHub, perl
 , go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }:
 
 buildGoPackage rec {
diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix
index a3f08cb5a07..7d3f773b193 100644
--- a/pkgs/tools/networking/srelay/default.nix
+++ b/pkgs/tools/networking/srelay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "srelay-0.4.8";
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 59cc89ac572..8b4850a6347 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libpcap }:
+{ stdenv, fetchurl, libpcap }:
 
 stdenv.mkDerivation rec {
   name = "tcpdump-${version}";
diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix
index 9e13cfc59c1..cfb627e8b3b 100644
--- a/pkgs/tools/networking/tcptraceroute/default.nix
+++ b/pkgs/tools/networking/tcptraceroute/default.nix
@@ -1,4 +1,4 @@
-{ stdenv , pkgs , fetchurl, libpcap, libnet
+{ stdenv  , fetchurl, libpcap, libnet
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index b9abba2cd0d..bc97d5d8d6e 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcp_wrappers }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "tftp-hpa-${version}";
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index db4b6a2281d..09c737c048a 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
+{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
   name = "tinc-${version}";
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix
index 5fe69ede1a7..ea40a541a22 100644
--- a/pkgs/tools/networking/ua/default.nix
+++ b/pkgs/tools/networking/ua/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn
+{ stdenv, buildGoPackage, fetchgit
 , pkgconfig
 , glib, libxml2
 }:
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index fe315666a2e..9f67dd4e2c3 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, python2Packages
 , wpa_supplicant, dhcp, dhcpcd, wirelesstools
-, nettools, openresolv, iproute, iputils
-, locale ? "C" }:
+, nettools, openresolv, iproute, iputils }:
 
 let
   inherit (python2Packages) python pygobject2 dbus-python pyGtkGlade pycairo;
diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix
index 263a4461530..7dc0e07f945 100644
--- a/pkgs/tools/networking/zap/default.nix
+++ b/pkgs/tools/networking/zap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jre, jdk, ant }:
+{ stdenv, fetchFromGitHub, jdk, ant }:
 
 stdenv.mkDerivation rec {
   name = "zap-${version}";
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index a2ff38ab300..69e978d3439 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, makeWrapper, buildEnv,
-  git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils, nix
+  git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix
 }:
 
 let mkPrefetchScript = tool: src: deps:
diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix
index facf47ebca6..9fe6ec6e291 100644
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }:
+{ lib, stdenv, fetchFromGitHub, nix, readline }:
 
 let rev = "a1ea85e92b067a0a42354a28355c633eac7be65c"; in
 
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index d03e6f614e5..660dce347a5 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch,
+{ stdenv, fetchFromGitHub,
   bzip2, nix, perl, perlPackages,
 }:
 
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index da62eba63fd..105cb6d7ab0 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -1,4 +1,4 @@
-{ lib, python2Packages, fetchurl, libxslt, docbook_xsl_ns, openssh
+{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh
 # version args
 , src, version
 }:
diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix
index 27edfa890fc..ce31de9f65d 100644
--- a/pkgs/tools/package-management/nixops/nixops-dns.nix
+++ b/pkgs/tools/package-management/nixops/nixops-dns.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildGoPackage
 , fetchFromGitHub }:
 
diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix
index 2d1e1fb326a..6f46b39e65b 100644
--- a/pkgs/tools/package-management/nixui/default.nix
+++ b/pkgs/tools/package-management/nixui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchgit, nix, node_webkit, config, makeDesktopItem
+{ stdenv, pkgs, fetchgit, nix, node_webkit, makeDesktopItem
 , writeScript }:
 let
   version = "0.2.1";
diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index c38ef25f354..f0f05a4c858 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, qtbase, qttools, packagekit }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, qttools, packagekit }:
 
 stdenv.mkDerivation rec {
   name = "packagekit-qt-${version}";
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 1ff0ad6f6b6..c61cbeb3268 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, callPackage, makeWrapper
+{ stdenv, fetchurl, callPackage, makeWrapper
 , clang, llvm, which, libcgroup
 }:
 
diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix
index d21500960fe..7637dcf246a 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/pkgs/tools/security/afl/qemu.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python2, zlib, pkgconfig, glib, ncurses, perl
-, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
+, attr, libcap, vde2, texinfo, libuuid, flex, bison, lzo, snappy
 , libaio, libcap_ng, gnutls, pixman, autoconf
 , writeText
 }:
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index 91a5fa4bdd2..b3c256ae59b 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "cfssl-${version}";
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
index 859c1fdf49a..a4afa772d10 100644
--- a/pkgs/tools/security/cipherscan/default.nix
+++ b/pkgs/tools/security/cipherscan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, makeWrapper, python, coreutils }:
+{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "cipherscan-${version}";
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 79644d35774..82599393724 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig
+{ stdenv, fetchurl, pkgconfig
 , zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2
 , libmspack, systemd
 }:
diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix
index 07061aa0d11..32819b603f9 100644
--- a/pkgs/tools/security/diceware/default.nix
+++ b/pkgs/tools/security/diceware/default.nix
@@ -1,6 +1,5 @@
 { lib
 , pythonPackages
-, fetchpatch
 }:
 
 with pythonPackages;
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index f27f9af59c6..b99087e475d 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -1,7 +1,7 @@
 {stdenv, system, fetchurl, dpkg, openssl, xorg
 , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype
 , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig
-, makeWrapper , makeDesktopItem, python, pythonPackages, lib
+, makeWrapper , python, pythonPackages, lib
 , libredirect, lsof}:
 
 let
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index b0381b32bcf..fd773da4ade 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba
+{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba
 , libiconv, npth, gettext, texinfo, pcsclite, sqlite
 
 # Each of the dependencies below are optional.
diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix
index cbd260455d8..df9d42211f6 100644
--- a/pkgs/tools/security/gorilla-bin/default.nix
+++ b/pkgs/tools/security/gorilla-bin/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
+{ fetchurl, makeWrapper, patchelf, stdenv, libXft, libX11, freetype, fontconfig, libXrender, libXScrnSaver, libXext }:
 
 stdenv.mkDerivation rec {
   name = "gorilla-bin-${version}";
diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix
index fd78d9b2efb..385a201d88b 100644
--- a/pkgs/tools/security/hash-slinger/default.nix
+++ b/pkgs/tools/security/hash-slinger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, openssh, gnupg, unbound, libreswan }:
+{ stdenv, fetchFromGitHub, pythonPackages, unbound, libreswan }:
 
 let
   inherit (pythonPackages) python;
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index 5d873885b1f..e6c375599a9 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "hologram-2018-03-19";
diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix
index d9617e3eb2b..62b92b7d0bd 100644
--- a/pkgs/tools/security/jd-gui/default.nix
+++ b/pkgs/tools/security/jd-gui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeShellScriptBin, writeText }:
+{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText }:
 
 let
   version = "1.4.0";
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index e55e97656f6..862b4a0df6e 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2
-, writeText, gcc, pythonPackages, perl, perlPackages, makeWrapper
+, gcc, pythonPackages, perl, perlPackages, makeWrapper
 }:
 
 with stdenv.lib;
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 1a7cf30b952..549794b7831 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
+{ stdenv, fetchurl, alsaLib, atk, cairo, cups
 , dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk3
-, libnotify, nspr, nss, pango, systemd, xorg, utillinuxMinimal }:
+, libnotify, nspr, nss, pango, systemd, xorg }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index c7e9267dde7..007414d68a5 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgs, fetchurl, fetchFromGitHub, buildEnv
+{ stdenv, lib, pkgs, fetchurl, buildEnv
 , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
 , makeWrapper
 
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix
index b198d7446a9..4acdd6cb897 100644
--- a/pkgs/tools/security/pinentry/mac.nix
+++ b/pkgs/tools/security/pinentry/mac.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }:
+{ stdenv, fetchFromGitHub, xcbuildHook, libiconv, Cocoa, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "pinentry-mac-0.9.4";
diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index 0c6d15e7d77..016017205ab 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , cmake, ccid, qttools, qttranslations
 , pkgconfig, pcsclite, hicolor-icon-theme 
 }:
diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index bf5f9116f08..047706cd8a6 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "saml2aws-${version}";
diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
index 26faf2c730c..bbcfc4c7890 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "sops-${version}";
diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index 0a9804a743b..50b16ad5839 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, patchelf }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name    = "ssdeep-${version}";
diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix
index f1bac7adba1..0c0cf29f977 100644
--- a/pkgs/tools/security/theharvester/default.nix
+++ b/pkgs/tools/security/theharvester/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, python2Packages, fetchFromGitHub, python2 }:
+{ stdenv, makeWrapper, python2Packages, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "theHarvester";
diff --git a/pkgs/tools/security/tor/update.nix b/pkgs/tools/security/tor/update.nix
index 6a7682a8f57..c944883d417 100644
--- a/pkgs/tools/security/tor/update.nix
+++ b/pkgs/tools/security/tor/update.nix
@@ -1,6 +1,5 @@
 { lib
 , writeScript
-, runCommand
 , common-updater-scripts
 , bash
 , coreutils
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 6e099e5d786..4f2671aeacb 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages, fetchurl, callPackage, nix, ronn }:
+{ stdenv, pythonPackages, nix, ronn }:
 
 pythonPackages.buildPythonApplication rec {
   pname = "vulnix";
diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index f99d22becdb..9cba7df21b7 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }:
+{stdenv, fetchurl, pkgconfig, glib, gtk2, python2Packages }:
 
 stdenv.mkDerivation rec {
   version = "0.14.7";
diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix
index ebe654d946e..3dc2a5caeb9 100644
--- a/pkgs/tools/system/confd/default.nix
+++ b/pkgs/tools/system/confd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "confd-${version}";
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index e664c0ef8e2..35c57dd8ea9 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "consul-template-${version}";
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index fc42c3b856f..2f507de9c22 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl, lzip
-, hostPlatform, buildPlatform
 }:
 
 let inherit (stdenv.lib) optionals; in
diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix
index b6f1af7b23f..5a902914b37 100644
--- a/pkgs/tools/system/evemu/default.nix
+++ b/pkgs/tools/system/evemu/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages
-, libevdev, linuxHeaders
+, libevdev
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix
index 77f65de9a8d..9eef3b064a0 100644
--- a/pkgs/tools/system/gohai/default.nix
+++ b/pkgs/tools/system/gohai/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ lib, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "gohai-${version}";
diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix
index 316b94befde..473d245618f 100644
--- a/pkgs/tools/system/journalwatch/default.nix
+++ b/pkgs/tools/system/journalwatch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, fetchgit, pythonOlder, systemd, pytest }:
+{ stdenv, buildPythonPackage, fetchurl, pythonOlder, systemd, pytest }:
 
 buildPythonPackage rec {
   pname = "journalwatch";
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index 7bbf42b1132..5b2be75e452 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -4,7 +4,7 @@
 , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
 , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
 , openssl, file, doxygen
-, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, path
+, gtest, sqlite, fpm, zstd, rdkafka, rapidjson
 }:
 
 let
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix
index cd3c815934f..b673c0f929a 100644
--- a/pkgs/tools/system/pcstat/default.nix
+++ b/pkgs/tools/system/pcstat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "pcstat-unstable-${version}";
diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix
index 3a5cb1b4965..5414d670423 100644
--- a/pkgs/tools/system/procodile/default.nix
+++ b/pkgs/tools/system/procodile/default.nix
@@ -1,4 +1,4 @@
-{ lib, bundlerEnv, ruby, stdenv }:
+{ lib, bundlerEnv, ruby }:
 
 bundlerEnv rec {
   name = "procodile-${version}";
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix
index 62be30319cf..56a8133bd3a 100644
--- a/pkgs/tools/text/codesearch/default.nix
+++ b/pkgs/tools/text/codesearch/default.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
   name = "codesearch-${version}";
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 27581134ca3..ab0f8893bfd 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, groff
+{ stdenv, fetchurl, perl
 , ghostscript #for postscript and html output
 , psutils, netpbm #for html output
 , buildPackages
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix
index c76ba8ea88d..829d734a8f7 100644
--- a/pkgs/tools/text/platinum-searcher/default.nix
+++ b/pkgs/tools/text/platinum-searcher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "the_platinum_searcher-${version}";
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 11355bb6df1..aa41e7b7f60 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, asciidoc, docbook_xsl, libxslt  }:
+{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt  }:
 
 rustPlatform.buildRustPackage rec {
   name = "ripgrep-${version}";
diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix
index e87a8bc0275..b7f8bd6df38 100644
--- a/pkgs/tools/text/sgml/jade/default.nix
+++ b/pkgs/tools/text/sgml/jade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgs, gnum4 }:
+{ stdenv, fetchurl, gnum4 }:
 
 stdenv.mkDerivation rec {
   name = "jade-${version}-${debpatch}";
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 7328cd3878a..fe699b35590 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "shfmt-${version}";
diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix
index efa5e539bd1..421715f7c33 100644
--- a/pkgs/tools/text/sift/default.nix
+++ b/pkgs/tools/text/sift/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "sift-${version}";
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 81b90e4925d..c3db482d271 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, wget, bash, coreutils }:
+{ stdenv, fetchurl, wget, bash }:
 
 stdenv.mkDerivation rec {
   version = "2.28";
diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index f9debaaf061..4271bf095a1 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, automake, autoconf, libtool
-, zlib, openssl, zip, zimlib, cxxtools, tntnet
+, zimlib, cxxtools, tntnet
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index 8ce2a6b0aa3..fa8af008955 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper
+{ stdenv, fetchFromGitHub, rustPlatform
 , darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix
index 0566e511870..4ee45bf4bc8 100644
--- a/pkgs/tools/typesetting/tex/nix/default.nix
+++ b/pkgs/tools/typesetting/tex/nix/default.nix
@@ -207,7 +207,6 @@ rec {
   simpleTeXToPNG =
     { preamble ? null
     , body
-    , name ? baseNameOf (toString body)
     , packages ? []
     }:
 
@@ -227,7 +226,6 @@ rec {
   simpleTeXToPDF =
     { preamble ? null
     , body
-    , name ? baseNameOf (toString body)
     , packages ? []
     }:
 
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 32894748ac4..9bc5a9b273b 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchurl
+{ stdenv, fetchurl
 , texlive
-, zlib, bzip2, ncurses, libiconv, libpng, flex, bison, libX11, libICE, xproto
-, freetype, t1lib, gd, libXaw, icu, ghostscript, ed, libXt, libXpm, libXmu, libXext
-, xextproto, perl, libSM, ruby, expat, curl, libjpeg, python, fontconfig, pkgconfig
-, poppler, libpaper, graphite2, zziplib, harfbuzz, texinfo, potrace, gmp, mpfr
-, xpdf, cairo, pixman, xorg, clisp, biber
+, zlib, libiconv, libpng, libX11
+, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
+, perl, pkgconfig
+, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
+, cairo, pixman, xorg, clisp, biber
 , makeWrapper
 }:
 
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index ed3dad64f16..939615f5797 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, flex, libxml2, libxslt
+{ fetchurl, stdenv, libxml2, libxslt
 , docbook_xml_dtd_45, docbook_xsl, w3m
 , bash, getopt, makeWrapper }:
 
diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix
index dab4bf44a6f..975e13b65da 100644
--- a/pkgs/tools/video/flvtool2/default.nix
+++ b/pkgs/tools/video/flvtool2/default.nix
@@ -1,4 +1,4 @@
-{ buildRubyGem, lib, ruby }:
+{ buildRubyGem, ruby }:
 
 buildRubyGem rec {
   inherit ruby;
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
index bb72fd2911f..32cf2771b51 100644
--- a/pkgs/tools/video/vnc2flv/default.nix
+++ b/pkgs/tools/video/vnc2flv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   name = "vnc2flv-20100207";
diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
index 549c830e887..ff9a13c500b 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "awless-${version}";
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 60ccc0f4724..5e2f84dee1d 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -1,4 +1,4 @@
-{ lib, pythonPackages, fetchurl, kmod, systemd, cloud-utils }:
+{ lib, pythonPackages, fetchurl, cloud-utils }:
 
 let version = "0.7.9";
 
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index 83a340348c8..2286faf4d1b 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, pkgconfig, buildGoPackage, fetchFromGitHub
+{ stdenv, pkgconfig, buildGoPackage, fetchFromGitHub
 , makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap
 }:
 
diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
index dce806cf6e3..ce628ff84b5 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, which, python2Packages }:
+{ stdenv, fetchgit, python2Packages }:
 
 let
   inherit (python2Packages) buildPythonApplication boto m2crypto;
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 3645de88bf8..e987bc7986b 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -2,7 +2,6 @@
 , fetchFromGitHub
 , buildPythonApplication
 , bash
-, shadow
 , systemd
 , utillinux
 , boto
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91d2d5aaa56..598f3c009ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -700,9 +700,7 @@ with pkgs;
 
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
-  titaniumenv = callPackage ../development/mobile/titaniumenv {
-    pkgs_i686 = pkgsi686Linux;
-  };
+  titaniumenv = callPackage ../development/mobile/titaniumenv { };
 
   abootimg = callPackage ../development/mobile/abootimg {};
 
@@ -5167,7 +5165,7 @@ with pkgs;
 
   sourceHighlight = callPackage ../tools/text/source-highlight { };
 
-  spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; };
+  spaceFM = callPackage ../applications/misc/spacefm { };
 
   squashfsTools = callPackage ../tools/filesystems/squashfs { };
 
@@ -6756,9 +6754,8 @@ with pkgs;
     (if pluginSupport then appendToName "with-plugin" else x: x)
       (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; });
 
-  oraclejdk10distro = packageType: pluginSupport:
-    (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; });
+  oraclejdk10distro = packageType: _:
+      (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType; });
 
   jikes = callPackage ../development/compilers/jikes { };
 
@@ -8639,7 +8636,6 @@ with pkgs;
 
   xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
-    stdenv = buildPackages.clangStdenv;
   };
   xcbuild = xcodebuild;
   xcbuildHook = makeSetupHook {
@@ -11417,7 +11413,6 @@ with pkgs;
     # XXX: mariadb doesn't built on fbsd as of nov 2015
     mysql = if (!stdenv.isFreeBSD) then mysql else null;
 
-    inherit libGL;
     inherit (pkgs.darwin) cf-private libobjc;
     inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL;
   };
@@ -11438,7 +11433,7 @@ with pkgs;
   qt56 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.6) {
       inherit newScope;
-      inherit stdenv fetchurl makeSetupHook makeWrapper;
+      inherit stdenv fetchurl makeSetupHook;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
       harfbuzz = harfbuzz-icu;
@@ -11452,7 +11447,7 @@ with pkgs;
   qt59 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.9) {
       inherit newScope;
-      inherit stdenv fetchurl makeSetupHook makeWrapper;
+      inherit stdenv fetchurl makeSetupHook;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
       harfbuzz = harfbuzz-icu;
@@ -11467,7 +11462,7 @@ with pkgs;
   qt511 = recurseIntoAttrs (makeOverridable
     (import ../development/libraries/qt-5/5.11) {
       inherit newScope;
-      inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
+      inherit stdenv fetchurl fetchFromGitHub makeSetupHook;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
       harfbuzz = harfbuzz-icu;
@@ -12167,13 +12162,9 @@ with pkgs;
 
   wavpack = callPackage ../development/libraries/wavpack { };
 
-  wayland = callPackage ../development/libraries/wayland {
-    graphviz = graphviz-nox;
-  };
+  wayland = callPackage ../development/libraries/wayland { };
 
-  wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix {
-    graphviz = graphviz-nox;
-  };
+  wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { };
 
   wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
 
@@ -12560,7 +12551,7 @@ with pkgs;
     openblas = openblasCompat;
     withRecommendedPackages = false;
     inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
-    inherit (darwin) cf-private libobjc;
+    inherit (darwin) libobjc;
   };
 
   rWrapper = callPackage ../development/r-modules/wrapper.nix {
@@ -12677,7 +12668,6 @@ with pkgs;
 
   couchdb = callPackage ../servers/http/couchdb {
     spidermonkey = spidermonkey_1_8_5;
-    python = python27;
     sphinx = python27Packages.sphinx;
     erlang = erlangR19;
   };
@@ -15751,7 +15741,7 @@ with pkgs;
     imagemagick = null;
     acl = null;
     gpm = null;
-    inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
+    inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
   };
 
   emacs26-nox = lowPrio (appendToName "nox" (emacs26.override {
@@ -15769,7 +15759,7 @@ with pkgs;
     imagemagick = null;
     acl = null;
     gpm = null;
-    inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
+    inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
   };
 
   emacs25-nox = lowPrio (appendToName "nox" (emacs25.override {
@@ -16369,9 +16359,7 @@ with pkgs;
     python = python27;
   };
 
-  git-review = callPackage ../applications/version-management/git-review {
-    python = python27;
-  };
+  git-review = callPackage ../applications/version-management/git-review { };
 
   gitolite = callPackage ../applications/version-management/gitolite { };
 
@@ -16414,7 +16402,6 @@ with pkgs;
 
   jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
     jdk = jetbrains.jdk;
-    androidsdk = androidsdk_extras;
   }) // {
     jdk = callPackage ../development/compilers/jetbrains-jdk {  };
   });
@@ -16869,9 +16856,7 @@ with pkgs;
     let
       mkApplications = import ../applications/kde;
       attrs = {
-        inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
-        inherit plasma5;
-        inherit attica phonon;
+        inherit lib libsForQt5 fetchurl;
         inherit okteta;
       };
     in
@@ -17183,7 +17168,6 @@ with pkgs;
 
   mercurial = callPackage ../applications/version-management/mercurial {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
-    inherit (darwin) cf-private;
     guiSupport = false; # use mercurialFull to get hgk GUI
   };
 
@@ -17502,7 +17486,6 @@ with pkgs;
   };
 
   synfigstudio = callPackage ../applications/graphics/synfigstudio {
-    fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
     inherit (gnome3) defaultIconTheme;
     mlt-qt5 = libsForQt5.mlt;
   };
@@ -18816,9 +18799,6 @@ with pkgs;
     nvidia_x11_i686 = if system == "x86_64-linux"
       then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }
       else null;
-    primusLib_i686 = if system == "x86_64-linux"
-      then pkgsi686Linux.primusLib
-      else null;
     libglvnd_i686 = if system == "x86_64-linux"
       then pkgsi686Linux.libglvnd
       else null;
@@ -19234,7 +19214,7 @@ with pkgs;
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
-  xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; };
+  xpra = callPackage ../tools/X11/xpra { };
   libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
   #TODO: 'pil' is not available for python3, yet
   xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; };
@@ -19268,7 +19248,6 @@ with pkgs;
   finalterm = callPackage ../applications/misc/finalterm { };
 
   roxterm = callPackage ../applications/misc/roxterm {
-    inherit (pythonPackages) lockfile;
     inherit (gnome3) gsettings-desktop-schemas vte;
   };
 
@@ -20176,7 +20155,7 @@ with pkgs;
   lumina = libsForQt5.callPackage ../desktops/lumina { };
 
   lxqt = recurseIntoAttrs (import ../desktops/lxqt {
-    inherit pkgs libsForQt5 fetchFromGitHub;
+    inherit pkgs libsForQt5;
     inherit (lib) makeScope;
   });
 
@@ -21245,7 +21224,7 @@ with pkgs;
   kops = callPackage ../applications/networking/cluster/kops { };
 
   lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
-  lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { guile = guile_1_8; };
+  lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { };
   lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix {
     lilypond = lilypond-unstable;
   };
@@ -21684,7 +21663,6 @@ with pkgs;
   };
 
   vice = callPackage ../misc/emulators/vice {
-    libX11 = xorg.libX11;
     giflib = giflib_4_1;
   };
 
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 8f8caf755ed..3440bfafb11 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, callPackage, wxGTK30, darwin }:
+{ callPackage, wxGTK30 }:
 
 rec {
   lib = callPackage ../development/beam-modules/lib.nix {};
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 4527451d71a..3782fc33d6a 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -6,7 +6,6 @@
 , fetchNuGet
 , pkgconfig
 , mono
-, monodevelop
 , fsharp
 , unzip
 , overrides ? {}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f6c992d5bd5..f1b0aa997ec 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -50,16 +50,14 @@ let
   };
 
   melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
-    inherit external lib;
+    inherit external;
   };
 
   melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
     inherit external lib;
   };
 
-  orgPackages = import ../applications/editors/emacs-modes/org-packages.nix {
-    inherit fetchurl lib stdenv texinfo;
-  };
+  orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { };
 
   emacsWithPackages = import ../build-support/emacs/wrapper.nix {
     inherit lib lndir makeWrapper stdenv runCommand;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5fef4872db2..bef3c2d0a21 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,5 +1,5 @@
 { buildPackages, pkgs
-, newScope, stdenv
+, newScope
 , buildPlatform, targetPlatform
 }:
 
diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix
index 3ac8d5f164d..35b0b42da3f 100644
--- a/pkgs/top-level/haxe-packages.nix
+++ b/pkgs/top-level/haxe-packages.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, fetchFromGitHub, newScope, haxe, neko, nodejs, wine, php, python3, jdk, mono, haskellPackages, fetchpatch }:
+{ stdenv, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }:
 
 let
   self = haxePackages;
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 77cd5b0eba5..73ed6bf9162 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, maven }:
+{ pkgs }:
 
 with pkgs;
 
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 520db16d366..cb9df438246 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -5,9 +5,9 @@
    for each package in a separate file: the call to the function would
    be almost as must code as the function itself. */
 
-{ fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool
-, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo
-, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
+{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig
+, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat
+, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
 , mysql, postgresql, cyrus_sasl
 , fetchFromGitHub, libmpack, which, fetchpatch, writeText
 }:
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a49d638dc47..eb76c323dde 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -748,14 +748,14 @@ let
     # Jane Street
 
     janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
-    
+
     janeStreet = import ../development/ocaml-modules/janestreet {
-      inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit;
+      inherit janePackage ocamlbuild angstrom ctypes cryptokit;
       inherit magic-mime num ocaml-migrate-parsetree octavius ounit;
       inherit ppx_deriving re zarith ppxlib;
       inherit (pkgs) stdenv openssl;
     };
-    
+
     janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix {
       janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; };
       inherit lib ocaml ocamlbuild ctypes cryptokit;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b5df07148d9..255ea6d4ffd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5,7 +5,7 @@
    for each package in a separate file: the call to the function would
    be almost as much code as the function itself. */
 
-{config, pkgs, fetchurl, fetchFromGitHub, stdenv, fetchsvn, gnused, perl, overrides}:
+{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}:
 
 let self = _self // overrides; _self = with self; {
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81d38de4f38..d1c0ac37489 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9650,7 +9650,7 @@ in {
   fixtures = callPackage ../development/python-modules/fixtures { };
 
   pelican = callPackage ../development/python-modules/pelican {
-    inherit (pkgs) glibcLocales pandoc git;
+    inherit (pkgs) glibcLocales git;
   };
 
   pep8 = buildPythonPackage rec {
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 3bc252e440f..8b7240e21a3 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -3,9 +3,7 @@
    $ hydra-eval-jobs pkgs/top-level/release-python.nix
 */
 
-{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
-, officialRelease ? false
-, # The platforms for which we build Nixpkgs.
+{ # The platforms for which we build Nixpkgs.
   supportedSystems ? [ "x86_64-linux" ]
 }:
 
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index cc6a8e0592a..1dface338a3 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -1,5 +1,4 @@
-{ pkgs, buildEnv, runCommand, hostPlatform, lib
-, stdenv }:
+{ pkgs, buildEnv, runCommand, hostPlatform, lib }:
 
 # These are some unix tools that are commonly included in the /usr/bin
 # and /usr/sbin directory under more normal distributions. Along with
-- 
GitLab


From cd6e2c9642b8e608c905f350cece21141435deef Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 21 Jul 2018 02:47:54 +0000
Subject: [PATCH 099/128] undo: try for zero rebuild on ofborg

---
 pkgs/development/ruby-modules/solargraph/default.nix | 2 +-
 pkgs/tools/admin/oxidized/default.nix                | 2 +-
 pkgs/tools/typesetting/asciidoctor/default.nix       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix
index 83f1dddeeb6..39520fdb0ba 100644
--- a/pkgs/development/ruby-modules/solargraph/default.nix
+++ b/pkgs/development/ruby-modules/solargraph/default.nix
@@ -1,4 +1,4 @@
-{ lib, bundlerApp, ruby }:
+{ lib, bundlerApp }:
 
 bundlerApp rec {
   pname = "solargraph";
diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix
index 590f6ea55ca..25b8bdb6585 100644
--- a/pkgs/tools/admin/oxidized/default.nix
+++ b/pkgs/tools/admin/oxidized/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, ruby, git, bundlerApp }:
+{ lib, ruby, bundlerApp }:
 
 bundlerApp rec {
   pname = "oxidized";
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix
index b1fe301775c..1f6a7054b9e 100644
--- a/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerApp, ruby, curl
+{ stdenv, lib, bundlerApp, ruby
   # Dependencies of the 'mathematical' package
 , cmake, bison, flex, glib, pkgconfig, cairo
 , pango, gdk_pixbuf, libxml2, python3, patchelf
-- 
GitLab


From 6e878df4513d117f078d04657b4048718570af51 Mon Sep 17 00:00:00 2001
From: hcmensch <hcmensch@umich.edu>
Date: Fri, 20 Jul 2018 23:00:54 -0400
Subject: [PATCH 100/128] added info for vim-ledger plugin in default.nix

---
 pkgs/misc/vim-plugins/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8428a3b7894..4e7817c6f7e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1657,6 +1657,17 @@ let
 
   };
 
+  vim-ledger = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-ledger-2017-12-12";
+    src = fetchgit {
+      url = "https://github.com/ledger/vim-ledger";
+      rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d";
+      sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01";
+    };
+    dependencies = [];
+
+  };
+
   vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jinja-2016-11-16";
     src = fetchgit {
-- 
GitLab


From 9991a755ed7b402651ba0457a33b7b19ff1abb5e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 21 Jul 2018 00:15:50 -0500
Subject: [PATCH 101/128] google-fonts: 2017-06-28 -> 2018-07-13

---
 pkgs/data/fonts/google-fonts/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index de281c278e6..0be58d06fa4 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "google-fonts-${version}";
-  version = "2017-06-28";
+  version = "2018-07-13";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fonts";
-    rev = "b1cb16c0ce2402242e0106d15b0429d1b8075ecc";
-    sha256 = "18kyclwipkdv4zxfws87x2l91jwn34vrizw8rmv8lqznnfsjh2lg";
+    rev = "3ca591dae7372a26e254ec6d22e7b453813b9530";
+    sha256 = "01ak3dzw2kihwa0dy27x8vvpiscd66mnkf61vj1xn29m4g48y0lr";
   };
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0n0j2hi1qb2sc6p3v6lpaqb2aq0m9xjmi7apz3hf2nx97rrsam22";
+  outputHash = "1pzm26794nwdbsvjnczpfchxiqa1n1zhp517g6g39wfm1nfszz83";
 
   phases = [ "unpackPhase" "patchPhase" "installPhase" ];
 
-- 
GitLab


From 6cc783ee29dc5f62787cd311c4544e866e63cbb4 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sat, 21 Jul 2018 09:45:38 +0300
Subject: [PATCH 102/128] avocode: 3.1.1 -> 3.2.0

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

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index fbf6443b91f..8d6e6c71366 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "avocode-${version}";
-  version = "3.1.1";
+  version = "3.2.0";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "1qvyc08i3b4rr43ssz78xndm4bx8lz2vigh6w9gd7w367xjf4f5b";
+    sha256 = "111kcjqm8j2v941m2ly4ahhxalylnsvy5zmclj1f490japz2h1xy";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
-- 
GitLab


From d3295790520e6687c9306f2cb8d111459d263eba Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sat, 21 Jul 2018 09:52:33 +0300
Subject: [PATCH 103/128] gitkraken: 3.6.4 -> 3.6.6

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

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index db2fdf0199e..0ea4a5235fd 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "3.6.4";
+  version = "3.6.6";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x";
+    sha256 = "01ir325ls1fb6ml79c02c7dyi910lxw0avlwc0nzv8fy4aqavl6p";
   };
 
   libPath = makeLibraryPath [
-- 
GitLab


From 501beb69f2f2b1679567c3436cf68ee3af66a49c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Jul 2018 02:48:59 -0500
Subject: [PATCH 104/128] dejagnu: 1.6 -> 1.6.1

---
 pkgs/development/tools/misc/dejagnu/default.nix   |  6 ++----
 .../dejagnu/wrapped-runtest-program-name.patch    | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch

diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index b734eadae90..d9fab774b76 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,15 +1,13 @@
 { fetchurl, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dejagnu-1.6";
+  name = "dejagnu-1.6.1";
 
   src = fetchurl {
     url = "mirror://gnu/dejagnu/${name}.tar.gz";
-    sha256 = "0qypaakd2065jgpcv84zcsibl8gph3p334gb2qdmhsrbirhlmdh0";
+    sha256 = "14hnq1mh91vqprc43xdy4f15sycw6fbajrh7zi6cw2kyg6xjhnxz";
   };
 
-  patches = [ ./wrapped-runtest-program-name.patch ];
-
   buildInputs = [ expect makeWrapper ];
 
   doCheck = true;
diff --git a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch b/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch
deleted file mode 100644
index d745bc65cbb..00000000000
--- a/pkgs/development/tools/misc/dejagnu/wrapped-runtest-program-name.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch gives `runtest' a `$0' that contains `runtest' instead
-of `.runtest-wrapped'.  This is required because `runtest' checks
-what `$0' looks like to determine the target.
-
---- dejagnu-1.4.4/runtest	2003-08-17 03:27:59.000000000 +0200
-+++ dejagnu-1.4.4/runtest	2010-03-18 15:57:58.000000000 +0100
-@@ -10,6 +10,7 @@
- # Get the execution path to this script and the current directory.
- #
- mypath=${0-.}
-+mypath="`echo $mypath | sed -'es|\.runtest-wrapped|runtest|g'`"
- if expr ${mypath} : '.*/.*' > /dev/null
- then
-     :
-
-- 
GitLab


From acd100e4b6b86ea7d80554b83879160059a66462 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 21 Jul 2018 07:53:23 +0000
Subject: [PATCH 105/128] ocamlPackages.ppx_blob: 0.2 -> 0.4.0

---
 .../ocaml-modules/ppx_blob/default.nix        | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix
index 9d5f4f4e669..45dd73d4a32 100644
--- a/pkgs/development/ocaml-modules/ppx_blob/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix
@@ -1,15 +1,26 @@
-{ stdenv, buildOcaml, fetchurl, ppx_tools }:
+{ stdenv, fetchurl, ocaml, findlib, jbuilder, alcotest
+, ocaml-migrate-parsetree
+}:
 
-buildOcaml rec {
-  name = "ppx_blob";
-  version = "0.2";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ppx_blob-${version}";
+  version = "0.4.0";
 
   src = fetchurl {
-    url = "https://github.com/johnwhitington/ppx_blob/archive/v${version}.tar.gz";
-    sha256 = "0kvqfm47f4xbgz0cl7ayz29myyb24xskm35svqrgakjq12nkpsss";
+    url = "https://github.com/johnwhitington/ppx_blob/releases/download/${version}/ppx_blob-${version}.tbz";
+    sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16";
   };
 
-  buildInputs = [ ppx_tools ];
+  unpackCmd = "tar xjf $curSrc";
+
+  buildInputs = [ ocaml findlib jbuilder alcotest ocaml-migrate-parsetree ];
+
+  buildPhase = "dune build -p ppx_blob";
+
+  doCheck = true;
+  checkPhase = "dune runtest -p ppx_blob";
+
+  inherit (jbuilder) installPhase;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/johnwhitington/ppx_blob;
-- 
GitLab


From 1493a45f4bd6a2d113030391a7c97152fcf39647 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Sat, 21 Jul 2018 10:39:41 +0200
Subject: [PATCH 106/128] bloop: 1.0.0-M11 -> 1.0.0

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

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 96e9d0f9a43..50b1d09ef93 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "bloop";
-  version = "1.0.0-M11";
+  version = "1.0.0";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -16,12 +16,12 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1";
+    outputHash     = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh";
   };
 in
 stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
-  nailgunCommit = "60c2d130";
+  nailgunCommit = "0c8b937b";
 
   buildInputs = [ jdk makeWrapper deps ];
 
-- 
GitLab


From 027d52ff34fad3eb03e7a392681f3dca86e956f1 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 21 Jul 2018 10:50:30 +0200
Subject: [PATCH 107/128] cuter: Fix build

---
 pkgs/development/tools/erlang/cuter/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index 3dc0d3fca88..a89861faebb 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3 python27 makeWrapper which ];
+  buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ];
 
   buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target";
   configurePhase = ''
-- 
GitLab


From effbf001b9913f9f12393f290b780296da4c66e0 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 21 Jul 2018 11:15:44 +0200
Subject: [PATCH 108/128] dxx-rebirth: Fix build

See also https://github.com/NixOS/nixpkgs/commit/8414fa2d6bb1249ed77565ff6b9f312fd52917da
---
 pkgs/games/dxx-rebirth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 9dde1da868d..e48ac612b32 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  hardeningDisable = [ "format" ];
+  NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
 
   buildPhase = ''
     runHook preBuild
-- 
GitLab


From 05bc5fed288666126fd5394657c5ef065cbd9710 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Thu, 17 May 2018 18:03:11 +0300
Subject: [PATCH 109/128] ssh: custom config key types

---
 nixos/modules/programs/ssh.nix | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 36289080a82..7a48624fd2a 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -62,6 +62,29 @@ in
         '';
       };
 
+      # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
+      pubkeyAcceptedKeyTypes = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "+ssh-dss"
+        ];
+        example = [ "ssh-ed25519" "ssh-rsa" ];
+        description = ''
+          Specifies the key types that will be used for public key authentication.
+        '';
+      };
+
+      hostKeyAlgorithms = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "+ssh-dss"
+        ];
+        example = [ "ssh-ed25519" "ssh-rsa" ];
+        description = ''
+          Specifies the host key algorithms that the client wants to use in order of preference.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -189,9 +212,8 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
-        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
-        PubkeyAcceptedKeyTypes +ssh-dss
-        HostKeyAlgorithms +ssh-dss
+        PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}
+        HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}
 
         ${cfg.extraConfig}
       '';
-- 
GitLab


From c89bdf970430eac9b62ea604593f9af5136d9d69 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 21 Jul 2018 11:26:45 +0200
Subject: [PATCH 110/128] signal-desktop: 1.14.3 -> 1.14.4

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

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index a8574680186..f38d0d53c6f 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,11 +40,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.14.3";
+  version = "1.14.4";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1z8z32d7ic28zg4mgk3cjmzb6kpism7xzym2ng25b0ndf72g1vfi";
+    sha256 = "0590r7748kv6g7zygq95v8qxf7vi2n5ypj6734x9yshrn8z6p8lr";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
-- 
GitLab


From 3572f89bbe154087d8ad83c36674d0c2499c0967 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 21 Jul 2018 12:26:53 +0200
Subject: [PATCH 111/128] ssh: don't add empty
 PubkeyAcceptedKeyTypes/HostKeyAlgorithms

The options introduced in e2444a433fb would generate a broken
ssh config when set to an empty list.

/etc/ssh/ssh_config line 7: Missing argument.
---
 nixos/modules/programs/ssh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index db44f9040dd..0f7f0515f0e 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -211,8 +211,8 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
-        PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}
-        HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}
+        ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) PubkeyAcceptedKeyTypes "${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
+        ${optionalString (cfg.hostKeyAlgorithms != []) HostKeyAlgorithms "${concatStringsSep "," cfg.hostKeyAlgorithms}"}
 
         ${cfg.extraConfig}
       '';
-- 
GitLab


From 07eb9736f0958582411d1c866c34f24f55827801 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Sat, 21 Jul 2018 12:30:02 +0200
Subject: [PATCH 112/128] gotools: 2017-08-08 -> 2018-07-20

---
 pkgs/development/tools/gotools/default.nix | 10 +++++-----
 pkgs/development/tools/gotools/deps.nix    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index e9a7e7ac891..4c4efa83d6b 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, go, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "gotools-${version}";
-  version = "20170807-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "5d2fd3ccab986d52112bf301d47a819783339d0e";
+  name = "gotools-unstable-${version}";
+  version = "2018-07-20";
+  rev = "be728107ea8275e6f58ba07e246b94181acaab24";
 
   goPackagePath = "golang.org/x/tools";
   goPackageAliases = [ "code.google.com/p/go.tools" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://go.googlesource.com/tools";
-    sha256 = "0r3fp7na6pg0bc5xfycjvv951f0vma1qfnpw5zy6l75yxm5r47kn";
+    sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix
index d4be771e8d6..e85fb120101 100644
--- a/pkgs/development/tools/gotools/deps.nix
+++ b/pkgs/development/tools/gotools/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-      sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
+      rev = "0ed95abb35c445290478a5348a7b38bb154135fd";
+      sha256 = "1v7yhcgqj0fy7rsliijw2iwmvyd85hqshrhh2n083x62kw9n9nsl";
     };
   }
 ]
-- 
GitLab


From 9d724038141f0ff649ae5089d9692939376b4853 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 21 Jul 2018 13:06:16 +0200
Subject: [PATCH 113/128] ssh: fix 3572f89bbe154087d8ad83c36674d0c2499c0967

---
 nixos/modules/programs/ssh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 0f7f0515f0e..cc398174e6c 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -211,8 +211,8 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
-        ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) PubkeyAcceptedKeyTypes "${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
-        ${optionalString (cfg.hostKeyAlgorithms != []) HostKeyAlgorithms "${concatStringsSep "," cfg.hostKeyAlgorithms}"}
+        ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
+        ${optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}"}
 
         ${cfg.extraConfig}
       '';
-- 
GitLab


From 8cf22dea82dbd1aaed625a3d6b6b9aab19341c5c Mon Sep 17 00:00:00 2001
From: Michishige Kaito <me@mkaito.com>
Date: Sat, 21 Jul 2018 12:49:06 +0100
Subject: [PATCH 114/128] gopass: 1.8.1 -> 1.8.2

---
 pkgs/tools/security/gopass/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 25102fd0730..88b15ebf43f 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }:
 
 buildGoPackage rec {
-  version = "1.8.1";
+  version = "1.8.2";
   name = "gopass-${version}";
 
   goPackagePath = "github.com/gopasspw/gopass";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "gopasspw";
     repo = "gopass";
     rev = "v${version}";
-    sha256 = "1b3caydxz3zf1ky6qvkx0dgidlalvpmga6cjh3gqc269n00lwh6w";
+    sha256 = "0a2nnm3liilp2jcsvgyp87cjw92gspcc3azaszfvx125l63r4c9f";
   };
 
   wrapperPath = with stdenv.lib; makeBinPath ([
@@ -26,9 +26,6 @@ buildGoPackage rec {
       $bin/share/bash-completion/completions \
       $bin/share/zsh/site-functions \
       $bin/share/fish/vendor_completions.d
-    # by default, gopass tries to write configuration to /homeless-shelter
-    # during startup, which lands in stdout
-    export GOPASS_CONFIG=/dev/null
     $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass
     $bin/bin/gopass completion zsh  > $bin/share/zsh/site-functions/_gopass
     $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish
-- 
GitLab


From d7cce082b09f0a740d867e6ea34ba7b330e94f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 21 Jul 2018 15:34:08 +0200
Subject: [PATCH 115/128] remove unused file

---
 .../python-modules/dateutil/1_5.nix           | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 pkgs/development/python-modules/dateutil/1_5.nix

diff --git a/pkgs/development/python-modules/dateutil/1_5.nix b/pkgs/development/python-modules/dateutil/1_5.nix
deleted file mode 100644
index 0808cf4f201..00000000000
--- a/pkgs/development/python-modules/dateutil/1_5.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six }:
-
-buildPythonPackage rec {
-  pname = "python-dateutil";
-  version = "2.7.3";
-  disabled = isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8";
-  };
-
-  propagatedBuildInputs = [ six ];
-
-  meta = with stdenv.lib; {
-    description = "Powerful extensions to the standard datetime module";
-    homepage = https://pypi.python.org/pypi/python-dateutil;
-    license = "BSD-style";
-  };
-}
-- 
GitLab


From 02f7053629753efa9b59b9bc52c044d3e9d28d48 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jul 2018 10:01:50 +0200
Subject: [PATCH 116/128] hackage2nix: disable
 reflex-dom-fragment-shader-canvas

The package depends on broken webkit and doesn't evaluate.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f50b02a7a95..e16ef73734b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2581,6 +2581,7 @@ dont-distribute-packages:
   passman-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-colonnade:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-dom-fragment-shader-canvas:            [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-helpers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-jsx:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From aa9b50ccf33cb6ff69f8335fd6fb4d34253bef50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Jul 2018 09:25:07 +0200
Subject: [PATCH 117/128] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.10.1-5-gfad2fe7 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/43ea4ff82a7c664ea817667f7d21caaa504fbfdb.
---
 .../haskell-modules/hackage-packages.nix      | 1001 +++++++++++++----
 1 file changed, 774 insertions(+), 227 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5816f295e0d..1587e1df690 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -758,6 +758,50 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
+  "Agda_2_5_4_1" = callPackage
+    ({ mkDerivation, alex, array, async, base, binary, blaze-html
+     , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq
+     , directory, EdisonCore, edit-distance, emacs, equivalence
+     , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable
+     , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
+     , regex-tdfa, stm, strict, template-haskell, text, time
+     , transformers, unordered-containers, uri-encode, zlib
+     }:
+     mkDerivation {
+       pname = "Agda";
+       version = "2.5.4.1";
+       sha256 = "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal filemanip filepath process ];
+       libraryHaskellDepends = [
+         array async base binary blaze-html boxes bytestring containers
+         data-hash deepseq directory EdisonCore edit-distance equivalence
+         filepath geniplate-mirror gitrev hashable hashtables haskeline
+         ieee754 mtl murmur-hash pretty process regex-tdfa stm strict
+         template-haskell text time transformers unordered-containers
+         uri-encode zlib
+       ];
+       libraryToolDepends = [ alex cpphs happy ];
+       executableHaskellDepends = [ base directory filepath process ];
+       executableToolDepends = [ emacs ];
+       postInstall = ''
+         files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
+         for f in "''${files[@]}" ; do
+           $out/bin/agda $f
+         done
+         for f in "''${files[@]}" ; do
+           $out/bin/agda -c --no-main $f
+         done
+         $out/bin/agda-mode compile
+       '';
+       description = "A dependently typed functional programming language and proof assistant";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ abbradar ];
+     }) {inherit (pkgs) emacs;};
+
   "Agda-executable" = callPackage
     ({ mkDerivation, Agda, base }:
      mkDerivation {
@@ -10626,6 +10670,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels-extra_0_4_0" = callPackage
+    ({ mkDerivation, base, criterion, hspec, hspec-discover
+     , JuicyPixels
+     }:
+     mkDerivation {
+       pname = "JuicyPixels-extra";
+       version = "0.4.0";
+       sha256 = "19lc2s80ww1pw2dy2vidrl14lhdvs3ji855l893p7p0sa23gkgqc";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base JuicyPixels ];
+       testHaskellDepends = [ base hspec JuicyPixels ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion JuicyPixels ];
+       description = "Efficiently scale, crop, flip images with JuicyPixels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-repa" = callPackage
     ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }:
      mkDerivation {
@@ -18744,12 +18806,15 @@ self: {
      }) {};
 
   "Win32-errors" = callPackage
-    ({ mkDerivation, base, template-haskell, text, Win32 }:
+    ({ mkDerivation, base, hspec, QuickCheck, template-haskell, text
+     , Win32
+     }:
      mkDerivation {
        pname = "Win32-errors";
-       version = "0.2.2.1";
-       sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031";
+       version = "0.2.2.3";
+       sha256 = "1glcaykk6ylmmsqxw4jfhrdnw5dg4syxc4v77q13wxsbzzrz3yn6";
        libraryHaskellDepends = [ base template-haskell text Win32 ];
+       testHaskellDepends = [ base hspec QuickCheck Win32 ];
        description = "Alternative error handling for Win32 foreign calls";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22025,6 +22090,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-typescript_0_1_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, hspec, interpolate, mtl, process, template-haskell
+     , temporary, text, th-abstraction, unordered-containers
+     }:
+     mkDerivation {
+       pname = "aeson-typescript";
+       version = "0.1.1.0";
+       sha256 = "0sx4gavp0pvnxlxwix1di34vm2bfi5d02mzgzs402grqhh1v38vp";
+       libraryHaskellDepends = [
+         aeson base containers interpolate mtl template-haskell text
+         th-abstraction unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath hspec
+         interpolate mtl process template-haskell temporary text
+         th-abstraction unordered-containers
+       ];
+       description = "Generate TypeScript definition files from your ADTs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific
      , text
@@ -29613,8 +29701,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.0.0.2";
-       sha256 = "0sv7xgmipb9cqyiry5mp0fr6abr7r45167ifq7sa518gz7a2a7ax";
+       version = "3.0.0.4";
+       sha256 = "0ynh8f0fn7fhpvslb5y5hl6kwcdycm15b3qfcr4x98yz71hk373s";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -40604,10 +40692,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-plan";
-       version = "0.3.0.0";
-       sha256 = "1axi3a60zq08d760w2x6akmszad599kij0r8zmlq8pin9mmmggls";
-       revision = "1";
-       editedCabalFile = "1xdmji5y2ssj8pgp0d78m8a5hd3swy2flhiaf1v9qb69502j8lwq";
+       version = "0.4.0.0";
+       sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1";
        configureFlags = [ "-fexe" ];
        isLibrary = true;
        isExecutable = true;
@@ -40616,7 +40702,7 @@ self: {
          containers directory filepath text vector
        ];
        executableHaskellDepends = [
-         ansi-terminal base base-compat bytestring containers mtl
+         ansi-terminal base base-compat bytestring containers directory mtl
          optparse-applicative parsec text vector
        ];
        doHaddock = false;
@@ -40983,14 +41069,14 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "cabal2spec_2_2_0" = callPackage
+  "cabal2spec_2_2_1" = callPackage
     ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
      , tasty-golden, time
      }:
      mkDerivation {
        pname = "cabal2spec";
-       version = "2.2.0";
-       sha256 = "0pcai2ikp6gna1h60dihclq7apj9jczwz4n0lnfc9fr176gzsprp";
+       version = "2.2.1";
+       sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal filepath time ];
@@ -43076,6 +43162,8 @@ self: {
        pname = "cborg";
        version = "0.2.0.0";
        sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340";
+       revision = "2";
+       editedCabalFile = "1fim6qbzimff8hpzv6bw558pzkh65cql8gdjinghc7w9c5my6y7l";
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim half integer-gmp
          primitive text
@@ -47342,15 +47430,16 @@ self: {
 
   "codeworld-api" = callPackage
     ({ mkDerivation, base, blank-canvas, cereal, cereal-text
-     , containers, hashable, mtl, random, random-shuffle, text, time
+     , containers, ghc-prim, hashable, mtl, random, random-shuffle, text
+     , time
      }:
      mkDerivation {
        pname = "codeworld-api";
-       version = "0.2.4";
-       sha256 = "17rpm9414fbwzxnpdvp67zlv6sl7ymkflgbbb50nhq7vv9z69dbc";
+       version = "0.2.5";
+       sha256 = "0gc1c0hc2sssiksii927kcg5rhalrw1fv3sr4zf4xvzj3nrd0k3m";
        libraryHaskellDepends = [
-         base blank-canvas cereal cereal-text containers hashable mtl random
-         random-shuffle text time
+         base blank-canvas cereal cereal-text containers ghc-prim hashable
+         mtl random random-shuffle text time
        ];
        description = "Graphics library for CodeWorld";
        license = stdenv.lib.licenses.asl20;
@@ -50048,6 +50137,8 @@ self: {
        pname = "conduit-parse";
        version = "0.2.1.0";
        sha256 = "1qfs61qhbr5gc0ch0mmqcqdm4wvs5pkx2z6rki588fhy1kfdp1dm";
+       revision = "1";
+       editedCabalFile = "1bgxjn9lbx67584xpwl2k9jrwvlgyqf4vkv0s7vs1nnc1h6qk7qw";
        libraryHaskellDepends = [
          base conduit dlist mtl parsers safe safe-exceptions text
          transformers
@@ -50163,10 +50254,8 @@ self: {
      }:
      mkDerivation {
        pname = "conf-json";
-       version = "1.1";
-       sha256 = "0jgyl56fgs506x4s28g14s08lcfnn6k4wh39j73cl576mlghr1rx";
-       revision = "6";
-       editedCabalFile = "1dyvz8jczzhr62s5cqr7gc4qd826nwgxkij0k41pfipw6jz0sc4f";
+       version = "1.2";
+       sha256 = "1j0m0zl1a7rkwczz58322kwsd9dzgwz2ia2q8l9h42ln239q0fbs";
        libraryHaskellDepends = [ aeson base bytestring directory ];
        testHaskellDepends = [
          aeson base binary bytestring directory hspec QuickCheck
@@ -52714,8 +52803,8 @@ self: {
     ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
      mkDerivation {
        pname = "crackNum";
-       version = "2.0";
-       sha256 = "1wi2k7yrm9z3n1b6vnw5zc3yj4k8drhap7fm2hk1z98wih4qppzp";
+       version = "2.1";
+       sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56829,6 +56918,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-msgpack_0_0_12" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , data-binary-ieee754, data-msgpack-types, deepseq, groom, hashable
+     , hspec, QuickCheck, text, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "data-msgpack";
+       version = "0.0.12";
+       sha256 = "11zlw465lpa371y7cpz9r4gn1c4cw0rjrpl5l3h6h0y3zc28p7sw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754 data-msgpack-types text
+       ];
+       executableHaskellDepends = [ base bytestring groom ];
+       testHaskellDepends = [
+         base bytestring containers data-msgpack-types hashable hspec
+         QuickCheck text unordered-containers vector void
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq QuickCheck
+       ];
+       description = "A Haskell implementation of MessagePack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-msgpack-types" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , QuickCheck, text, unordered-containers, vector, void
@@ -56845,6 +56961,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-msgpack-types_0_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, hashable
+     , hspec, QuickCheck, text, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "data-msgpack-types";
+       version = "0.0.2";
+       sha256 = "19c7285mrs9d1afgpdq4cprv44fif76ahahg3xpzijc5lhgxmzal";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq hashable QuickCheck text
+         unordered-containers vector void
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       description = "A Haskell implementation of MessagePack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-named" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, text }:
      mkDerivation {
@@ -58926,8 +59060,8 @@ self: {
     ({ mkDerivation, base, containers, foldl }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.6";
-       sha256 = "1qp99fbx14y49lsh269jdc5mazz30rqwr1if3gc1qn4m5d8dsqir";
+       version = "0.6.3";
+       sha256 = "1b020879qdbh08pzgxwj5y7fk31n071crbcs9601j7fxj4a1i0hq";
        libraryHaskellDepends = [ base containers foldl ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
@@ -62830,8 +62964,8 @@ self: {
      }:
      mkDerivation {
        pname = "distribution-opensuse";
-       version = "1.0.0";
-       sha256 = "0zy0whx8badksaqqkswslrgrz57mpx3pfjjhrqrvn7088anwb7rr";
+       version = "1.1.0";
+       sha256 = "1spqr4ygxhdgmy17cmwx1z4r1czlf85hd6yk9zpwpj9py9v5b0g2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62839,6 +62973,7 @@ self: {
          hashable hsemail mtl parsec-class pretty text time turtle
        ];
        executableHaskellDepends = [ base containers text turtle ];
+       testHaskellDepends = [ base ];
        description = "Types, functions, and tools to manipulate the openSUSE distribution";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64344,18 +64479,12 @@ self: {
      }) {};
 
   "drinkery" = callPackage
-    ({ mkDerivation, base, conduit, conduit-combinators, exceptions
-     , gauge, list-t, ListT, machines, mtl, pipes, transformers
-     }:
+    ({ mkDerivation, base, exceptions, mtl, transformers }:
      mkDerivation {
        pname = "drinkery";
-       version = "0.3";
-       sha256 = "10iiffxnmc5hgsa4c5m59zxbz80b3cpddv6293jiw2vxpfq2f7w4";
+       version = "0.4";
+       sha256 = "1c5mv0klhdavbsaa1mng0q15vy0cz6x8ijfzgaf1f18yyxvb0q1q";
        libraryHaskellDepends = [ base exceptions mtl transformers ];
-       benchmarkHaskellDepends = [
-         base conduit conduit-combinators exceptions gauge list-t ListT
-         machines mtl pipes transformers
-       ];
        description = "Boozy streaming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64724,6 +64853,8 @@ self: {
        pname = "dublincore-xml-conduit";
        version = "0.1.0.2";
        sha256 = "17jzyj49j88xwsz54higi81a6v8kvb8i338n5416z1ni475qsynl";
+       revision = "1";
+       editedCabalFile = "1rljgmi4jb6yhigfy394jb64q5f5qx7i1g68pw6zgq9ziz91p321";
        libraryHaskellDepends = [
          base conduit conduit-combinators safe-exceptions text time timerep
          uri-bytestring xml-conduit xml-types
@@ -65893,9 +66024,11 @@ self: {
      }:
      mkDerivation {
        pname = "edit";
-       version = "0.0.1.1";
-       sha256 = "0smxb6v4n83b09dyaj388hhi7kx1ca6axg60q3adnixy13a284lz";
-       libraryHaskellDepends = [ base deepseq transformers ];
+       version = "1.0.0.0";
+       sha256 = "0p93j90f40ckg5n9d8hnsbd5qsi00c28cpdrczgihk81hjgflnkd";
+       libraryHaskellDepends = [
+         base comonad deepseq QuickCheck transformers
+       ];
        testHaskellDepends = [
          base comonad doctest QuickCheck tasty tasty-discover
          tasty-quickcheck uniplate
@@ -67194,8 +67327,8 @@ self: {
      }:
      mkDerivation {
        pname = "email-header";
-       version = "0.4.0";
-       sha256 = "0lmdb8s29w5wbrwsfcn43z354ms3xblffprgvg22rb16ny1410hn";
+       version = "0.4.1";
+       sha256 = "14xs001ab0p2y6f9hl9lw8bwd4fcg23y5ia3wfcafn6893pbb5f6";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring case-insensitive
          containers exceptions text text-icu time
@@ -69120,6 +69253,8 @@ self: {
        pname = "euler-tour-tree";
        version = "0.1.0.1";
        sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4";
+       revision = "1";
+       editedCabalFile = "033v38mr81pr81gb5wksi7bgpm1wrvcgck893dk1ymq4w6ifa2m6";
        libraryHaskellDepends = [
          base containers fingertree mtl parser-combinators transformers
          Unique
@@ -71856,6 +71991,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fcm-client" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
+     , conduit, conduit-extra, containers, data-default-class
+     , http-client, http-conduit, http-types, HUnit, lens
+     , optparse-applicative, QuickCheck, resourcet, retry, scientific
+     , stm-conduit, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "fcm-client";
+       version = "0.1.0.0";
+       sha256 = "1qv43pfwgi7d7bx445z3q3zr7szv6y7ky9gb6g7f1chxs4q6mcdl";
+       revision = "1";
+       editedCabalFile = "1rvb99gh2m1j2bd9x6vc58kvkwdcxl5wwypvnj3c62zcqmdln03l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring containers data-default-class
+         http-client http-conduit http-types lens scientific text time
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring conduit conduit-extra
+         data-default-class http-client http-types lens optparse-applicative
+         resourcet retry stm-conduit text utf8-string
+       ];
+       testHaskellDepends = [
+         aeson base containers data-default-class HUnit lens QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+       ];
+       description = "Admin API for Firebase Cloud Messaging";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fdo-notify" = callPackage
     ({ mkDerivation, base, containers, dbus }:
      mkDerivation {
@@ -75943,20 +76111,19 @@ self: {
 
   "fraxl" = callPackage
     ({ mkDerivation, async, base, dependent-map, dependent-sum
-     , exceptions, free, mtl, time, transformers, type-aligned
-     , vinyl-plus
+     , exceptions, free, mtl, time, transformers, type-aligned, vinyl
      }:
      mkDerivation {
        pname = "fraxl";
-       version = "0.1.0.0";
-       sha256 = "0q21g7ggdfrl7afkx9g2apx2nzh7fs7fpy63zhjylav16xhycc56";
-       revision = "1";
-       editedCabalFile = "1fjwfiydrw1dga0dy6cwwji4kjzichr6nx7hazkx11r08lqncxzi";
+       version = "0.2.0.1";
+       sha256 = "1k5fcl6d9yxc2773x0vv7z8q1pq3mf6l29icr4yc4wxsxw4l3r7k";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base dependent-map dependent-sum exceptions free mtl
-         transformers type-aligned vinyl-plus
+         transformers type-aligned vinyl
        ];
-       testHaskellDepends = [ base mtl time transformers ];
+       benchmarkHaskellDepends = [ base time ];
        description = "Cached and parallel data fetching";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76639,8 +76806,8 @@ self: {
     ({ mkDerivation, base, bytestring, process, text }:
      mkDerivation {
        pname = "fromhtml";
-       version = "0.1.0.3";
-       sha256 = "1zj811728g1hwpagq7jl1qxppn164vn4b27pxn20151iljipq1va";
+       version = "0.1.0.4";
+       sha256 = "1p1qkidh5wgfgrqqa59zi77rvgphh2wh8ldql4plxq5flh2zszkx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring process text ];
@@ -82374,8 +82541,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180626";
-       sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q";
+       version = "6.20180719";
+       sha256 = "13fbkdf461z4wqvjlzfjp3h17xyy8jb1av4s6jmlg1jl7656q96k";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
@@ -82386,7 +82553,7 @@ self: {
        isExecutable = true;
        setupHaskellDepends = [
          base bytestring Cabal data-default directory exceptions filepath
-         hslogger IfElse process split unix-compat utf8-string
+         hslogger IfElse process split transformers unix-compat utf8-string
        ];
        executableHaskellDepends = [
          aeson async base bloomfilter byteable bytestring case-insensitive
@@ -83445,6 +83612,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glabrous_0_4_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , cereal, cereal-text, directory, either, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glabrous";
+       version = "0.4.0";
+       sha256 = "0qja5mdnbgrsdiwqjfwrzzynbybwg5yksvnwgazak0wv2p86i5yh";
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
+         either text unordered-containers
+       ];
+       testHaskellDepends = [
+         base directory either hspec text unordered-containers
+       ];
+       description = "A template DSL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glade" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
      , libglade
@@ -87491,23 +87679,26 @@ self: {
      }) {};
 
   "greenclip" = callPackage
-    ({ mkDerivation, base, binary, classy-prelude, directory, microlens
-     , microlens-mtl, text, unix, utf8-string, vector, X11
+    ({ mkDerivation, base, binary, bytestring, directory, exceptions
+     , hashable, libXau, microlens, microlens-mtl, protolude, text, unix
+     , vector, wordexp, X11, x11, xcb, xdmcp
      }:
      mkDerivation {
        pname = "greenclip";
-       version = "2.0.1";
-       sha256 = "05f146ff9ff4kyaxx92jwb5g0nj0bb2j41hx12b4vjk28vik1x5y";
+       version = "3.0.2";
+       sha256 = "1b1nx2jnwal1fhwh7cq0hv1nrwc2hzzh96yab6cpv0r8bm34qxs7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base binary classy-prelude directory microlens microlens-mtl text
-         unix utf8-string vector X11
+         base binary bytestring directory exceptions hashable microlens
+         microlens-mtl protolude text unix vector wordexp X11
        ];
+       executablePkgconfigDepends = [ libXau x11 xcb xdmcp ];
        description = "Simple clipboard manager to be integrated with rofi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs.xorg) libXau; inherit (pkgs) x11; xcb = null; 
+         xdmcp = null;};
 
   "greg-client" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, hostname, network
@@ -90640,8 +90831,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.10.3";
-       sha256 = "00khz032sy78z5rr36d20zj4grbbqkf1rk1x8m0nf05ca6gfwjbj";
+       version = "1.10.4";
+       sha256 = "09sczm8l93lmkjz0c5l9al9jp8jpqcmk2zbxbbbq4g2jrsb3v30y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96656,8 +96847,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskus-binary";
-       version = "0.6.0.0";
-       sha256 = "0r0np4kdvyfslgjqs983dzv4xi5s62splahn2ra55qjbm8lpmps0";
+       version = "1.0";
+       sha256 = "1gw08zx7mqhi6n0wx6s6n4fvw5ambbdxnahr3r3p22yfqnqcp4y2";
        libraryHaskellDepends = [
          base bytestring cereal haskus-utils mtl
        ];
@@ -96671,19 +96862,19 @@ self: {
      }) {};
 
   "haskus-system-build" = callPackage
-    ({ mkDerivation, base, directory, filepath, hashable, haskus-utils
-     , optparse-applicative, optparse-simple, process, simple-download
-     , temporary, text, yaml
+    ({ mkDerivation, base, conduit, directory, filepath, hashable
+     , haskus-utils, http-conduit, optparse-applicative, optparse-simple
+     , process, temporary, text, yaml
      }:
      mkDerivation {
        pname = "haskus-system-build";
-       version = "0.7.0.0";
-       sha256 = "1wfl4n7manfwgwjccvrsfwjb3la7sjg1zpzgj8v6r5sv2zdyl86g";
+       version = "1.0";
+       sha256 = "1xzl5f8wilmdq9bg37zzdcv59cqp8kxnhbm6fd8pzqnj8w1pkwdk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base directory filepath hashable haskus-utils optparse-applicative
-         optparse-simple process simple-download temporary text yaml
+         base conduit directory filepath hashable haskus-utils http-conduit
+         optparse-applicative optparse-simple process temporary text yaml
        ];
        description = "Haskus system build tool";
        license = stdenv.lib.licenses.bsd3;
@@ -96691,17 +96882,20 @@ self: {
      }) {};
 
   "haskus-utils" = callPackage
-    ({ mkDerivation, base, containers, extra, file-embed, list-t, mtl
-     , stm, stm-containers, tasty, tasty-quickcheck, template-haskell
-     , transformers, vector
+    ({ mkDerivation, base, containers, extra, file-embed
+     , haskus-utils-data, haskus-utils-types, haskus-utils-variant
+     , list-t, mtl, recursion-schemes, stm, stm-containers, tasty
+     , tasty-quickcheck, template-haskell, transformers, vector
      }:
      mkDerivation {
        pname = "haskus-utils";
-       version = "0.8.0.0";
-       sha256 = "1r2r1198hhv75f4yqcy5crr764dvvj766bgp3v3b5sdl603q8cl3";
+       version = "1.0";
+       sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd";
        libraryHaskellDepends = [
-         base containers extra file-embed list-t mtl stm stm-containers
-         template-haskell transformers vector
+         base containers extra file-embed haskus-utils-data
+         haskus-utils-types haskus-utils-variant list-t mtl
+         recursion-schemes stm stm-containers template-haskell transformers
+         vector
        ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Haskus utility modules";
@@ -96709,6 +96903,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskus-utils-data" = callPackage
+    ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl
+     , recursion-schemes, transformers
+     }:
+     mkDerivation {
+       pname = "haskus-utils-data";
+       version = "1.0";
+       sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4";
+       libraryHaskellDepends = [
+         base containers extra haskus-utils-types mtl recursion-schemes
+         transformers
+       ];
+       description = "Haskus utility modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "haskus-utils-types" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "haskus-utils-types";
+       version = "1.0";
+       sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf";
+       libraryHaskellDepends = [ base ];
+       description = "Haskus utility modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "haskus-utils-variant" = callPackage
+    ({ mkDerivation, base, haskus-utils-data, haskus-utils-types }:
+     mkDerivation {
+       pname = "haskus-utils-variant";
+       version = "1.0";
+       sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn";
+       libraryHaskellDepends = [
+         base haskus-utils-data haskus-utils-types
+       ];
+       description = "Haskus utility modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskyapi" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
      , directory, http-conduit, markdown, mtl, network, parsec
@@ -97917,6 +98151,8 @@ self: {
        pname = "hbro";
        version = "1.7.0.0";
        sha256 = "0vx3097g9q0bxyv1bwa4mc6aw152zkj3mawk5nrn5mh0zr60c3zh";
+       revision = "1";
+       editedCabalFile = "0slsd0f0qvlh4l6777b8iaskd4ij04193mcjwnq8p7szslxx40q1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -97946,6 +98182,8 @@ self: {
        pname = "hbro-contrib";
        version = "1.7.0.0";
        sha256 = "024mclr0hrvxdbsw9d051v9dfls2n3amyxlqfzakf11vrkgqqfam";
+       revision = "1";
+       editedCabalFile = "1vfkwzd5rsv0065bldkd90fprp1qspfqg44ip5i4ihnbj4vawv9b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -100605,34 +100843,38 @@ self: {
      }) {};
 
   "hgeometry" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, containers
-     , contravariant, criterion, data-clist, deepseq, deepseq-generics
-     , directory, doctest, fixed-vector, Frames, hexpat, hspec, lens
-     , linear, mtl, optparse-applicative, parsec, QuickCheck, random
-     , semigroupoids, semigroups, singletons, template-haskell, text
-     , time, vector, vinyl
+    ({ mkDerivation, aeson, approximate-equality, array, base
+     , bifunctors, bytestring, colour, containers, contravariant
+     , criterion, data-clist, deepseq, deepseq-generics, dlist, doctest
+     , fingertree, fixed-vector, hexpat, hspec, hspec-discover, lens
+     , linear, mtl, optparse-applicative, parsec, QuickCheck
+     , quickcheck-instances, random, reflection, semigroupoids
+     , semigroups, singletons, template-haskell, text, vector, vinyl
+     , yaml
      }:
      mkDerivation {
        pname = "hgeometry";
-       version = "0.6.0.0";
-       sha256 = "1pphbdl5sn6gvm4crshpnfjmf0c8kwfz68hv615hhadp7120x3ij";
-       revision = "1";
-       editedCabalFile = "19j3n0kf7n2n0spyr83gdjngxnfxvyr1sryvhq8jflsxq44d8rdg";
+       version = "0.7.0.0";
+       sha256 = "0c91n42l6pqkdw46snhplvzm8f05x0x5g3b7mgx13ndskcf9vmyz";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bifunctors bytestring containers contravariant data-clist
-         deepseq directory fixed-vector Frames hexpat lens linear mtl
-         optparse-applicative parsec random semigroupoids semigroups
-         singletons template-haskell text time vector vinyl
+         aeson base bifunctors bytestring colour containers contravariant
+         data-clist deepseq dlist fingertree fixed-vector hexpat lens linear
+         mtl parsec QuickCheck quickcheck-instances random reflection
+         semigroupoids semigroups singletons template-haskell text vector
+         vinyl yaml
        ];
        testHaskellDepends = [
-         array base bytestring containers data-clist doctest Frames hspec
-         lens linear QuickCheck random semigroups vector vinyl
+         approximate-equality array base bytestring colour containers
+         data-clist doctest hspec lens linear QuickCheck
+         quickcheck-instances random semigroups singletons vector vinyl
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
-         base criterion deepseq deepseq-generics Frames lens QuickCheck
-         semigroups
+         base bytestring containers criterion deepseq deepseq-generics
+         fixed-vector lens linear optparse-applicative QuickCheck semigroups
        ];
        description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
@@ -103500,21 +103742,19 @@ self: {
      , cryptohash-md5, cryptohash-sha1, cryptohash-sha256
      , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff
      , directory, exceptions, filepath, generic-random, Glob, hashable
-     , hashing, haskeline, http-client, http-client-tls, http-types
-     , interpolate, lens-family, lens-family-core, lens-family-th
-     , logict, megaparsec, monadlist, mtl, optparse-applicative
-     , pretty-show, process, QuickCheck, quickcheck-instances
-     , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups
-     , serialise, split, syb, tasty, tasty-hunit, tasty-quickcheck
+     , hashing, haskeline, hedgehog, hspec-discover, http-client
+     , http-client-tls, http-types, interpolate, lens-family
+     , lens-family-core, lens-family-th, logict, megaparsec, monadlist
+     , mtl, optparse-applicative, pretty-show, process, regex-tdfa
+     , regex-tdfa-text, repline, scientific, semigroups, serialise
+     , split, syb, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
      , tasty-th, template-haskell, text, these, time, transformers, unix
      , unordered-containers, vector, xml
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.5.1";
-       sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al";
-       revision = "1";
-       editedCabalFile = "1l8h9zc9mrqvp8hvkfz1g2inq2b95x42gscyfn6qv0jcxwn4sbpr";
+       version = "0.5.2";
+       sha256 = "059l2zqbqi5826qq1dq00vl7f1kfyr0wrs9imsx36yfbr9ac9wqk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103522,7 +103762,7 @@ self: {
          containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256
          cryptohash-sha512 data-fix deepseq deriving-compat directory
          exceptions filepath hashable hashing haskeline http-client
-         http-client-tls http-types lens-family lens-family-core
+         http-client-tls http-types interpolate lens-family lens-family-core
          lens-family-th logict megaparsec monadlist mtl optparse-applicative
          pretty-show process regex-tdfa regex-tdfa-text scientific
          semigroups serialise split syb template-haskell text these time
@@ -103539,11 +103779,12 @@ self: {
          ansi-wl-pprint base base16-bytestring bytestring containers
          cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
          data-fix deepseq Diff directory exceptions filepath generic-random
-         Glob hashing interpolate megaparsec mtl optparse-applicative
-         pretty-show process QuickCheck quickcheck-instances serialise split
-         tasty tasty-hunit tasty-quickcheck tasty-th template-haskell text
-         time transformers unix unordered-containers
+         Glob hashing hedgehog interpolate megaparsec mtl
+         optparse-applicative pretty-show process serialise split tasty
+         tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th
+         template-haskell text time transformers unix unordered-containers
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          ansi-wl-pprint base base16-bytestring bytestring containers
          criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256
@@ -109124,6 +109365,20 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "hspec-need-env" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, hspec-expectations
+     , setenv, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-need-env";
+       version = "0.1.0.0";
+       sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d";
+       libraryHaskellDepends = [ base hspec-core hspec-expectations ];
+       testHaskellDepends = [ base hspec hspec-core setenv transformers ];
+       description = "Read environment variables for hspec tests";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hspec-pg-transact" = callPackage
     ({ mkDerivation, base, bytestring, hspec, pg-transact
      , postgresql-simple, resource-pool, text, tmp-postgres
@@ -110531,8 +110786,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-parse";
-       version = "0.2.0.1";
-       sha256 = "1v6i9g4l0j8mvi12lqv40k30lpn8bv28pvf6ps0zgjgpb2khfxsw";
+       version = "0.2.0.2";
+       sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38";
        libraryHaskellDepends = [
          attoparsec base containers deepseq text
        ];
@@ -112548,6 +112803,8 @@ self: {
        pname = "hw-dsv";
        version = "0.2.1";
        sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv";
+       revision = "1";
+       editedCabalFile = "1di1vdj6c0s0n2zjhjhy8iszlgk29gbh7a46pc4q0hp587avff04";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112652,10 +112909,25 @@ self: {
        pname = "hw-hedgehog";
        version = "0.1.0.1";
        sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6";
+       revision = "1";
+       editedCabalFile = "0a5qlh5dwsnv14ngimbsvpgxx4hf0c0wdi5yfv7afwj9h2afdpfz";
+       libraryHaskellDepends = [ base hedgehog vector ];
+       testHaskellDepends = [ base ];
+       description = "Extra hedgehog functionality";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hw-hedgehog_0_1_0_2" = callPackage
+    ({ mkDerivation, base, hedgehog, vector }:
+     mkDerivation {
+       pname = "hw-hedgehog";
+       version = "0.1.0.2";
+       sha256 = "0fk5qgn011j7cb75xi434vk0vq4bl8w9lrs6hpf45c8mv4c48vby";
        libraryHaskellDepends = [ base hedgehog vector ];
        testHaskellDepends = [ base ];
        description = "Extra hedgehog functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-hspec-hedgehog" = callPackage
@@ -112666,6 +112938,8 @@ self: {
        pname = "hw-hspec-hedgehog";
        version = "0.1.0.5";
        sha256 = "0kznqpliqnahyayi1q08mfz4qwhqvz54hb8cv6r2ps3lyjnpmlfk";
+       revision = "1";
+       editedCabalFile = "05fg0d89652yhsji35ckh9qiiy4y7c04i6zya9hrkgwl2jaq55fv";
        libraryHaskellDepends = [
          base call-stack hedgehog hspec HUnit transformers
        ];
@@ -115727,6 +116001,8 @@ self: {
        pname = "imm";
        version = "1.3.0.0";
        sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar";
+       revision = "1";
+       editedCabalFile = "02g2cpwqp9fqggzjv5y2gyvxayqbrfjai133jn7y2laa9bxia3x4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118178,6 +118454,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ip_1_4_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , doctest, hashable, hspec, HUnit, primitive, QuickCheck
+     , quickcheck-classes, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, vector
+     }:
+     mkDerivation {
+       pname = "ip";
+       version = "1.4.0";
+       sha256 = "12y9ym7gjdwlixp727z4hf0hmi8x021shvrv6vhg4s4bgn3rvch5";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring hashable primitive text vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring doctest hspec HUnit QuickCheck
+         quickcheck-classes test-framework test-framework-hunit
+         test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion text
+       ];
+       description = "Library for IP and MAC addresses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ip-quoter" = callPackage
     ({ mkDerivation, base, cpu, network, tasty, tasty-hunit
      , template-haskell
@@ -119344,10 +119646,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-opts";
-       version = "0.1.0.5";
-       sha256 = "0h4k2fy8w2hcyglfgl1jzxr6as04lc4ks8wk4id8h4gpn6bgdfrn";
-       revision = "1";
-       editedCabalFile = "1mn1jrpwzm1pcmw942i0kg0na56zagxsqcqs9y32j1xnlkgljkpn";
+       version = "0.1.0.6";
+       sha256 = "014dnfflf09gfn6c47jjg25lq95bx9sl6nkj18zylyzy0f1qszrq";
        libraryHaskellDepends = [
          base base-compat containers data-reify dlist fgl filepath ivory
          monadLib pretty
@@ -122658,15 +122958,15 @@ self: {
     ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite
      , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text
+     , text, vector
      }:
      mkDerivation {
        pname = "keccak";
-       version = "0.1.2";
-       sha256 = "0jrnx5w2nxxc47lmw71c57cqja3mynx8j3fr89rjwby6mym5yw4g";
+       version = "0.2.0";
+       sha256 = "1hkp6zn86bvn817vvxd2yqjgfh76n0ynvyqq2942frl1i0v19ymw";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring ];
+       libraryHaskellDepends = [ base bytestring vector ];
        executableHaskellDepends = [ base base16-bytestring bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring cryptonite HUnit memory parsec
@@ -122676,7 +122976,7 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring cryptonite gauge memory
        ];
-       description = "haskell keccak functions";
+       description = "cryptographic functions based on the sponge construction";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -124795,8 +125095,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.14";
-       sha256 = "13nafbk4h8z3vx12i6zs250795c3ipsgxq83bhgha2w0wjr49d18";
+       version = "1.2.0.15";
+       sha256 = "0ldjbsnspn55xbkwcjbyswiqlpf885si5xl2z0n5kvvwmlrgmfkx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -124819,8 +125119,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-bash";
-       version = "0.7.0";
-       sha256 = "0w7r5ngpz3ifahjfccz6ma9m2jdmn5nqimk5154hk35skcjwrswx";
+       version = "0.7.1";
+       sha256 = "1p8ikx9iq9ssvm8b99hly7pqqw09588xjkgf5397kg5xpv8ga4gp";
        libraryHaskellDepends = [ base parsec pretty transformers ];
        testHaskellDepends = [
          base parsec process QuickCheck tasty tasty-expected-failure
@@ -127125,6 +127425,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-labels_0_1_0_2" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "lens-labels";
+       version = "0.1.0.2";
+       sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1";
+       libraryHaskellDepends = [ base ghc-prim ];
+       description = "Integration of lenses with OverloadedLabels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-labels" = callPackage
     ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
      mkDerivation {
@@ -145137,10 +145449,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-msgpack-rpc";
-       version = "0.0.4";
-       sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r";
-       revision = "2";
-       editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3";
+       version = "0.0.5";
+       sha256 = "0lrlq5amcgg84ja2wjxkqm9llsbpsj6n0zrk7vvfjcra144b39rq";
        libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          data-default-class data-default-instances-base data-msgpack
@@ -146649,11 +146959,28 @@ self: {
        pname = "non-empty";
        version = "0.3";
        sha256 = "1q2vplh7pddf8cpjzs3yvy1dn7lqlg32ianr6j5qwwwl9hfnr43p";
+       revision = "1";
+       editedCabalFile = "0ivvxcfm3qhv7ynb3ql89wrybbda1s2p5nr0viw7nqrybjz5hfzh";
+       libraryHaskellDepends = [
+         base containers deepseq QuickCheck utility-ht
+       ];
+       description = "List-like structures with static restrictions on the number of elements";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "non-empty_0_3_0_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht
+     }:
+     mkDerivation {
+       pname = "non-empty";
+       version = "0.3.0.1";
+       sha256 = "00zbnpcnmchbbdgyw19m1bl3bdhmw89pp9k0mq3z75nz0i40gg9z";
        libraryHaskellDepends = [
          base containers deepseq QuickCheck utility-ht
        ];
        description = "List-like structures with static restrictions on the number of elements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "non-empty-containers" = callPackage
@@ -149804,6 +150131,8 @@ self: {
        pname = "opml-conduit";
        version = "0.6.0.4";
        sha256 = "07axacfa0wik2cnpzcnjjp9w6ws8sjhinzxdc4vrxdxaj1v5a2s8";
+       revision = "1";
+       editedCabalFile = "160sazqsrmm2755642c5y5i38miiglqb66cy5k0hy4k2jkdmjfbi";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base case-insensitive conduit conduit-combinators containers
@@ -151204,7 +151533,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_2_2" = callPackage
+  "pandoc_2_2_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -151219,8 +151548,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.2.2";
-       sha256 = "0rbr6mjm7kfzxrjbglqj6bgz1l1zlbiiff3pi59nhqava3nindqc";
+       version = "2.2.2.1";
+       sha256 = "19d6cd8ry735ziazfkk6xhrjbvx5ywpbqmhxr3wbmp8kyp6c7x7m";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -161477,8 +161806,8 @@ self: {
      }:
      mkDerivation {
        pname = "primitive-extras";
-       version = "0.3";
-       sha256 = "1az9933jkf3891l6svzvg1fhprmcnjj1bklr0rglrljlj8m01laz";
+       version = "0.3.0.1";
+       sha256 = "0qipddb5065z6c7klbaz75d8jbx39k8qppv8d7xb6hnj28v62ab7";
        libraryHaskellDepends = [
          base cereal deferred-folds foldl primitive profunctors vector
        ];
@@ -162889,6 +163218,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libpulseaudio;};
 
+  "proto-lens_0_2_2_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default-class, lens-family, parsec, pretty, text
+     , transformers, void
+     }:
+     mkDerivation {
+       pname = "proto-lens";
+       version = "0.2.2.0";
+       sha256 = "173sz83pw237qp037j6spy055ghayinfjg5m4p4mvgmjnnzpw1cj";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers data-default-class
+         lens-family parsec pretty text transformers void
+       ];
+       description = "A lens-based implementation of protocol buffers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default-class, deepseq, lens-family, lens-labels, parsec
@@ -162974,9 +163321,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-protobuf-types_0_2_2_0" = callPackage
+    ({ mkDerivation, base, Cabal, lens-family, proto-lens
+     , proto-lens-protoc, protobuf, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-protobuf-types";
+       version = "0.2.2.0";
+       sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72";
+       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       libraryHaskellDepends = [
+         base lens-family proto-lens proto-lens-protoc text
+       ];
+       libraryToolDepends = [ protobuf ];
+       description = "Basic protocol buffer message types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) protobuf;};
+
   "proto-lens-protobuf-types" = callPackage
     ({ mkDerivation, base, Cabal, lens-family, proto-lens
-     , proto-lens-protoc, text
+     , proto-lens-protoc, protobuf, text
      }:
      mkDerivation {
        pname = "proto-lens-protobuf-types";
@@ -162986,16 +163351,44 @@ self: {
        libraryHaskellDepends = [
          base lens-family proto-lens proto-lens-protoc text
        ];
+       libraryToolDepends = [ protobuf ];
        description = "Basic protocol buffer message types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) protobuf;};
+
+  "proto-lens-protoc_0_2_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers
+     , data-default-class, directory, filepath, haskell-src-exts
+     , lens-family, lens-labels, process, proto-lens
+     , proto-lens-descriptors, protobuf, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-protoc";
+       version = "0.2.2.3";
+       sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers data-default-class directory
+         filepath haskell-src-exts lens-family lens-labels process
+         proto-lens proto-lens-descriptors text
+       ];
+       libraryToolDepends = [ protobuf ];
+       executableHaskellDepends = [
+         base bytestring containers data-default-class filepath
+         haskell-src-exts lens-family proto-lens proto-lens-descriptors text
+       ];
+       description = "Protocol buffer compiler for the proto-lens library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protoc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, deepseq, directory, filepath
      , haskell-src-exts, lens-family, lens-labels, pretty, process
-     , proto-lens, text
+     , proto-lens, protobuf, text
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
@@ -163008,13 +163401,14 @@ self: {
          directory filepath haskell-src-exts lens-family lens-labels pretty
          process proto-lens text
        ];
+       libraryToolDepends = [ protobuf ];
        executableHaskellDepends = [
          base bytestring containers data-default-class deepseq filepath
          haskell-src-exts lens-family proto-lens text
        ];
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) {inherit (pkgs) protobuf;};
 
   "protobuf" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
@@ -164319,30 +164713,30 @@ self: {
 
   "puzzle-draw" = callPackage
     ({ mkDerivation, aeson, base, blaze-svg, bytestring, containers
-     , deepseq, diagrams-lib, diagrams-svg, filepath, hashable, hspec
-     , linear, mtl, optparse-applicative, parsec, process, SVGFonts
-     , tasty, tasty-golden, tasty-hspec, tasty-hunit, text
-     , unordered-containers, vector-space, yaml
+     , deepseq, diagrams-lib, diagrams-rasterific, filepath, hashable
+     , hspec, linear, mtl, optparse-applicative, parsec, SVGFonts, tasty
+     , tasty-hspec, tasty-hunit, text, unordered-containers
+     , vector-space, yaml
      }:
      mkDerivation {
        pname = "puzzle-draw";
-       version = "0.2.0.0";
-       sha256 = "04sibf7rpr2dyxn943nbl8jzzy7zcf5ic0najgy1kmrl5n4v7p02";
+       version = "0.3.0.0";
+       sha256 = "0vnmq65khi1lcrf3rz4ym7lnv3178rvnb884rln0jspil6bs4cs7";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base containers diagrams-lib diagrams-svg filepath hashable
-         linear mtl optparse-applicative parsec SVGFonts text
+         aeson base containers diagrams-lib diagrams-rasterific filepath
+         hashable linear mtl optparse-applicative parsec SVGFonts text
          unordered-containers vector-space yaml
        ];
        executableHaskellDepends = [
-         aeson base diagrams-lib diagrams-svg filepath optparse-applicative
-         process tasty tasty-golden yaml
+         aeson base containers diagrams-lib diagrams-rasterific filepath
+         optparse-applicative yaml
        ];
        testHaskellDepends = [
-         base blaze-svg bytestring containers deepseq diagrams-lib
-         diagrams-svg hspec tasty tasty-hspec tasty-hunit text yaml
+         base blaze-svg bytestring containers deepseq diagrams-lib hspec
+         tasty tasty-hspec tasty-hunit text yaml
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
@@ -165328,14 +165722,15 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.12";
-       sha256 = "1gnzaw5vvn5xk6h9zjvdjicxq35ppwvrs87fys1lk51c402npvz7";
+       version = "0.4.13";
+       sha256 = "19kndmc019dhz0b8iajplpiifl1x3ph39zwp2c2n3rp5v41syxrs";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups semirings tagged transformers
        ];
        testHaskellDepends = [
-         aeson base primitive QuickCheck tagged transformers vector
+         aeson base containers primitive QuickCheck semigroupoids tagged
+         transformers vector
        ];
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
@@ -165589,8 +165984,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-string-random";
-       version = "0.1.0.1";
-       sha256 = "1yx1kyd6p58b7s10v0lkq1v162vnz90p6m9jlwbr4s6qxa0sm31r";
+       version = "0.1.1.0";
+       sha256 = "1dxazyn5h2njhjs41x2cb5nwydf87a29yxgy7wv40s6fq6ajj084";
        libraryHaskellDepends = [ base QuickCheck string-random text ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck text
@@ -168758,7 +169153,7 @@ self: {
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) {raptor2 = null; inherit (pkgs) redland;};
+     }) {raptor2 = null; redland = null;};
 
   "redo" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
@@ -169163,6 +169558,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reflex-dom-fragment-shader-canvas" = callPackage
+    ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens
+     , reflex-dom, text, transformers
+     }:
+     mkDerivation {
+       pname = "reflex-dom-fragment-shader-canvas";
+       version = "0.1";
+       sha256 = "1zc8kgny3d467lxpwg5mm1amg6924m5ifkkafyh18nfzqffvc3bl";
+       revision = "1";
+       editedCabalFile = "1s08vdpwyyfrfw7hfbn2i2m9b3dszcdd7dmfyd0z1pbxy6wj1xmz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers ghcjs-dom jsaddle lens reflex-dom text transformers
+       ];
+       executableHaskellDepends = [ base reflex-dom text ];
+       description = "A reflex-dom widget to draw on a canvas with a fragment shader program";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reflex-dom-helpers" = callPackage
     ({ mkDerivation, base, reflex, reflex-dom, template-haskell }:
      mkDerivation {
@@ -171363,8 +171779,8 @@ self: {
      }:
      mkDerivation {
        pname = "reqcatcher";
-       version = "0.1.0.1";
-       sha256 = "1ywh83ydy48mlix7mglnkhsjj3b13jqs2gs52by6q1g438nb31in";
+       version = "0.1.1.0";
+       sha256 = "15qpd11ijbip88pf7sn1cmms369cv963l2xdp3wxg7qvlf362ns8";
        libraryHaskellDepends = [ base http-types network text wai warp ];
        testHaskellDepends = [
          base http-client http-types HUnit lens tasty tasty-hunit wai wreq
@@ -174100,6 +174516,37 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "rss-conduit_0_4_2_2" = callPackage
+    ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring
+     , conduit, conduit-combinators, containers, data-default
+     , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck
+     , quickcheck-instances, resourcet, safe, safe-exceptions
+     , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , timerep, uri-bytestring, vinyl, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "rss-conduit";
+       version = "0.4.2.2";
+       sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps";
+       revision = "1";
+       editedCabalFile = "1y5f1fvjjljk0rl8payxm9dsazzh2057nq9m9bi4gxwa8lkfz21d";
+       libraryHaskellDepends = [
+         atom-conduit base conduit conduit-combinators containers
+         dublincore-xml-conduit lens-simple safe safe-exceptions singletons
+         text time timerep uri-bytestring vinyl xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         atom-conduit base blaze-builder bytestring conduit
+         conduit-combinators data-default dublincore-xml-conduit lens-simple
+         mono-traversable QuickCheck quickcheck-instances resourcet
+         safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text
+         time uri-bytestring vinyl xml-conduit xml-types
+       ];
+       description = "Streaming parser/renderer for the RSS standard";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rss2irc" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq
      , feed, http-client, http-conduit, http-types, io-storage, irc
@@ -175657,8 +176104,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.9";
-       sha256 = "0x57ppvlzvaqsd3aazx8gqcrqgjiqs06ch5rkkjsd0c9nifpb04m";
+       version = "7.10";
+       sha256 = "0bq3h0aidjdh7a9gp97mxfpng4x36mxyb4bgmj4pyjqdnbdgr05p";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -177591,8 +178038,8 @@ self: {
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.3.2";
-       sha256 = "0w4pqh9bcdnkyjmy24am2b894627x9is33vbyw03r0br9pd7q82q";
+       version = "0.3.3";
+       sha256 = "0i2b4mxwa2m2p9xks18wna0p84732kbjvjiz3cy0pd9jfmc92vbm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -178363,6 +178810,8 @@ self: {
        pname = "serialise";
        version = "0.2.0.0";
        sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0";
+       revision = "2";
+       editedCabalFile = "1wvqzrbf80ry5xc2s9va24024gfgwi6xj1yvm7578f7mq0k1zqvf";
        libraryHaskellDepends = [
          array base bytestring cborg containers ghc-prim half hashable
          primitive text time unordered-containers vector
@@ -180436,7 +180885,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serverless-haskell_0_7_0" = callPackage
+  "serverless-haskell_0_7_1" = callPackage
     ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
      , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
      , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
@@ -180444,8 +180893,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.7.0";
-       sha256 = "04z67q8g8qkksivvqw8dk8m883f3kicc98m16v17hpdv5kni8qcj";
+       version = "0.7.1";
+       sha256 = "1vjiv56w591vparjw3372fz2vsa5hcm5j3p90j00x882gm23wf22";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -183950,8 +184399,8 @@ self: {
      }:
      mkDerivation {
        pname = "sitepipe";
-       version = "0.3.0.0";
-       sha256 = "0h1qcc9d721yczd1szylxpxc1nzi2np6xa5b1rlsck6yjr238bwz";
+       version = "0.3.0.1";
+       sha256 = "1iv0ndllixwn9vj7gqavv1ymfxfxqm4xqqzxqf1y8qiq240b3j6l";
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions filepath Glob
          lens lens-aeson megaparsec MissingH mtl mustache
@@ -184568,8 +185017,8 @@ self: {
      }:
      mkDerivation {
        pname = "slick";
-       version = "0.1.0.0";
-       sha256 = "0irp1d9z5l8jr33qgbnkq05lpkpll6dw84qyl0cd2xnqs1iklyds";
+       version = "0.1.0.2";
+       sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm";
        libraryHaskellDepends = [
          aeson base binary bytestring containers lens lens-aeson mustache
          pandoc shake text time
@@ -185583,6 +186032,8 @@ self: {
        pname = "snap-templates";
        version = "1.0.0.1";
        sha256 = "1l6gc2ppsvbaf783namglpyzghhynlg97q3ajc2ralibs21vsn7c";
+       revision = "1";
+       editedCabalFile = "0m54p36hvwn3zaixalb5jiy9siq1ksf5da5d0407rys87wfy711b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -185774,8 +186225,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-customauth";
-       version = "0.1.0";
-       sha256 = "1xc45lvhr3psqhv87n75f5968q129fgz3cz6362qvcnbnyyiznz3";
+       version = "0.1.1";
+       sha256 = "0alh5jaygcxnjpm5r3qx2c6al1x73shzwqi67820rzqxix2np8pc";
        libraryHaskellDepends = [
          aeson base base64-bytestring binary binary-orphans bytestring
          configurator containers errors heist hoauth2 http-client
@@ -189470,6 +189921,8 @@ self: {
        pname = "stack-prism";
        version = "0.1.7";
        sha256 = "0a09x8b78j08cn0l492hj6yx15fhs6bipaiwgjqsax37ynnrxhqz";
+       revision = "1";
+       editedCabalFile = "1xd0hcp003ijakpcjgcmllsa65i0924has9wllvsj8i0mnapcni3";
        libraryHaskellDepends = [
          base profunctors tagged template-haskell transformers
        ];
@@ -191676,6 +192129,8 @@ self: {
        pname = "streaming-base64";
        version = "0.1.0.0";
        sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6";
+       revision = "1";
+       editedCabalFile = "0mc71ncw2mw3yfryk0g2iq86wba7i3khy8fbsjaz5dr22hkkzh9r";
        libraryHaskellDepends = [
          base safe-exceptions streaming streaming-bytestring transformers
        ];
@@ -192482,16 +192937,19 @@ self: {
 
   "string-random" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , pcre-heavy, QuickCheck, random, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers
+     , optparse-applicative, pcre-heavy, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers
      }:
      mkDerivation {
        pname = "string-random";
-       version = "0.1.0.0";
-       sha256 = "090lin4b0y7xccwpnw8q33kfdljjw6annbl2d1jldird7db086ah";
+       version = "0.1.1.0";
+       sha256 = "0gypx0lg9kz8s2aksj2qg238m41cnl49k4bxwz7sgf94h12nhil2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base containers random text transformers
        ];
+       executableHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [
          base bytestring pcre-heavy QuickCheck tasty tasty-hunit
          tasty-quickcheck text
@@ -193859,24 +194317,22 @@ self: {
      }) {};
 
   "sv" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bifunctors
-     , bytestring, charset, containers, contravariant, deepseq, hedgehog
-     , lens, mtl, parsec, parsers, profunctors, readable, semigroupoids
-     , semigroups, tasty, tasty-hedgehog, tasty-hunit, text
-     , transformers, trifecta, utf8-string, validation, vector, void
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava
+     , contravariant, hedgehog, hw-dsv, lens, Only, parsers
+     , semigroupoids, semigroups, sv-core, tasty, tasty-hedgehog
+     , tasty-hunit, text, transformers, trifecta, utf8-string
+     , validation, vector
      }:
      mkDerivation {
        pname = "sv";
-       version = "0.1";
-       sha256 = "0rd4jf4qqfc66xxddvaa37fjmpmmjzb7n928gclds0xibzm9ls7s";
+       version = "1.0";
+       sha256 = "1sgyly9b6nrij5hpj3ffvwj6m3ygm43wbi8xkd2gxs2jh5zjzvw3";
        libraryHaskellDepends = [
-         ansi-wl-pprint attoparsec base bifunctors bytestring charset
-         containers contravariant deepseq lens mtl parsec parsers
-         profunctors readable semigroupoids semigroups text transformers
-         trifecta utf8-string validation vector void
+         attoparsec base bifunctors bytestring contravariant hw-dsv
+         semigroupoids sv-core transformers utf8-string validation
        ];
        testHaskellDepends = [
-         ansi-wl-pprint base bytestring contravariant hedgehog lens parsers
+         base bytestring cassava contravariant hedgehog lens Only parsers
          semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text
          trifecta utf8-string validation vector
        ];
@@ -193886,24 +194342,88 @@ self: {
      }) {};
 
   "sv-cassava" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit, sv
-     , text, utf8-string, validation, vector
+    ({ mkDerivation, attoparsec, base, bytestring, cassava, HUnit
+     , sv-core, text, utf8-string, validation, vector
      }:
      mkDerivation {
        pname = "sv-cassava";
-       version = "0.1";
-       sha256 = "050f2ji5zhispjqm66n6jbdq4x20dijzrkl20vpgx4i42z7fmn15";
+       version = "0.2";
+       sha256 = "01bhh3b85gsbgm3fb0ppb1ihcm2p0rkv6bsmw16l3b2jgj806zin";
        libraryHaskellDepends = [
-         attoparsec base bytestring cassava sv utf8-string vector
+         attoparsec base bytestring cassava sv-core utf8-string validation
+         vector
        ];
        testHaskellDepends = [
-         base bytestring cassava HUnit sv text validation vector
+         base bytestring cassava HUnit sv-core text validation vector
        ];
        description = "Integration to use sv with cassava's parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sv-core" = callPackage
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring
+     , containers, contravariant, deepseq, lens, mtl, parsec
+     , profunctors, QuickCheck, readable, semigroupoids, semigroups
+     , tasty, tasty-quickcheck, text, transformers, trifecta
+     , utf8-string, validation, vector, void
+     }:
+     mkDerivation {
+       pname = "sv-core";
+       version = "0.1";
+       sha256 = "0zqzj6i4xbw7bjzn40mimn4rw1g88jndrdxzdmrbdigfdncxhyl3";
+       libraryHaskellDepends = [
+         attoparsec base bifunctors bytestring containers contravariant
+         deepseq lens mtl parsec profunctors readable semigroupoids
+         semigroups text transformers trifecta utf8-string validation vector
+         void
+       ];
+       testHaskellDepends = [
+         base bytestring profunctors QuickCheck semigroupoids semigroups
+         tasty tasty-quickcheck text validation vector
+       ];
+       description = "Encode and decode separated values (CSV, PSV, ...)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "sv-svfactor" = callPackage
+    ({ mkDerivation, base, bytestring, lens, profunctors, sv-core
+     , svfactor, validation
+     }:
+     mkDerivation {
+       pname = "sv-svfactor";
+       version = "0.1";
+       sha256 = "0j97va25p30x3q07084mbv4lsls6p2yky8y7zmf9w6i7i42r3bi0";
+       libraryHaskellDepends = [
+         base bytestring lens profunctors sv-core svfactor validation
+       ];
+       description = "sv-core + svfactor";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "svfactor" = callPackage
+    ({ mkDerivation, attoparsec, base, bifunctors, bytestring, charset
+     , deepseq, hedgehog, lens, parsec, parsers, semigroupoids
+     , semigroups, tasty, tasty-hedgehog, tasty-hunit, text
+     , transformers, trifecta, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "svfactor";
+       version = "0.1";
+       sha256 = "1vjdv7xgd33z3iwwlh8xwp9za06jvqxpbssc4m5bmcx1wihsnn35";
+       libraryHaskellDepends = [
+         attoparsec base bifunctors bytestring charset deepseq lens parsec
+         parsers semigroupoids semigroups text transformers trifecta
+         utf8-string vector
+       ];
+       testHaskellDepends = [
+         base bytestring hedgehog lens parsers semigroups tasty
+         tasty-hedgehog tasty-hunit text trifecta utf8-string vector
+       ];
+       description = "Syntax-preserving CSV manipulation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "svg-builder" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, hashable, text
      , unordered-containers
@@ -198024,7 +198544,6 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {tensorflow = null;};
 
   "tensorflow-core-ops" = callPackage
@@ -198045,7 +198564,6 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -198073,7 +198591,6 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-opgen" = callPackage
@@ -198091,7 +198608,6 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -198121,21 +198637,22 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-proto" = callPackage
-    ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc }:
+    ({ mkDerivation, base, Cabal, proto-lens, proto-lens-protoc
+     , protobuf
+     }:
      mkDerivation {
        pname = "tensorflow-proto";
        version = "0.1.0.0";
        sha256 = "06k87dvpsf8pnbb1qq5gjxpjc2sra95y1bwmsnpmlg1qn0ppi5mn";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
+       libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
     ({ mkDerivation, base, bytestring, cereal, snappy-framing
@@ -198151,7 +198668,6 @@ self: {
        ];
        description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-records-conduit" = callPackage
@@ -198168,7 +198684,6 @@ self: {
        ];
        description = "Conduit wrappers for TensorFlow.Records.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-test" = callPackage
@@ -198200,6 +198715,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "termbox" = callPackage
+    ({ mkDerivation, array, base, c2hs }:
+     mkDerivation {
+       pname = "termbox";
+       version = "0.1.0";
+       sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ array base ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [ base ];
+       description = "termbox bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "termbox-bindings" = callPackage
     ({ mkDerivation, base, c2hs }:
      mkDerivation {
@@ -202049,6 +202579,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "timer-wheel" = callPackage
+    ({ mkDerivation, atomic-primops, base, ghc-prim, primitive
+     , psqueues
+     }:
+     mkDerivation {
+       pname = "timer-wheel";
+       version = "0.1.0";
+       sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j";
+       libraryHaskellDepends = [
+         atomic-primops base ghc-prim primitive psqueues
+       ];
+       description = "A timer wheel";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "timerep" = callPackage
     ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck
      , tasty, tasty-hunit, tasty-quickcheck, text, time
@@ -214798,8 +215343,8 @@ self: {
      }:
      mkDerivation {
        pname = "web-inv-route";
-       version = "0.1.2";
-       sha256 = "1qhs2gi1591bphdr1wxbn2za7kfskywndz4bcr741q825m2bakhd";
+       version = "0.1.2.1";
+       sha256 = "0pdbcc9mg2wrc3jm7g2dcsqgqv89dgjcnxs810gzw3d3rh418i5m";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers happstack-server
          hashable http-types invertible network-uri snap-core text
@@ -216257,35 +216802,35 @@ self: {
 
   "winery" = callPackage
     ({ mkDerivation, base, binary, bytestring, cassava, containers, cpu
-     , deepseq, fingertree, gauge, hashable, mtl, prettyprinter
-     , prettyprinter-ansi-terminal, serialise, text, transformers
-     , unordered-containers, vector
+     , deepseq, gauge, hashable, megaparsec, mtl, prettyprinter
+     , prettyprinter-ansi-terminal, scientific, serialise, text
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "winery";
-       version = "0.1.1";
-       sha256 = "10f6il6vf7p6613xg9jk1s8rd0hppmirpazhibplsqscr6nnjaar";
+       version = "0.1.2";
+       sha256 = "0g18xgby2k5cgb1ymyv92ii9rqj07ng12v2qfsp8yk15fcrx0ky9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers cpu fingertree hashable mtl
-         prettyprinter prettyprinter-ansi-terminal text transformers
-         unordered-containers vector
+         base bytestring containers cpu hashable megaparsec mtl
+         prettyprinter prettyprinter-ansi-terminal scientific text
+         transformers unordered-containers vector
        ];
        executableHaskellDepends = [
-         base bytestring containers cpu fingertree hashable mtl
-         prettyprinter prettyprinter-ansi-terminal text transformers
-         unordered-containers vector
+         base bytestring containers cpu hashable megaparsec mtl
+         prettyprinter prettyprinter-ansi-terminal scientific text
+         transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         base bytestring containers cpu fingertree hashable mtl
-         prettyprinter prettyprinter-ansi-terminal text transformers
-         unordered-containers vector
+         base bytestring containers cpu hashable megaparsec mtl
+         prettyprinter prettyprinter-ansi-terminal scientific text
+         transformers unordered-containers vector
        ];
        benchmarkHaskellDepends = [
-         base binary bytestring cassava containers cpu deepseq fingertree
-         gauge hashable mtl prettyprinter prettyprinter-ansi-terminal
-         serialise text transformers unordered-containers vector
+         base binary bytestring cassava containers cpu deepseq gauge
+         hashable megaparsec mtl prettyprinter prettyprinter-ansi-terminal
+         scientific serialise text transformers unordered-containers vector
        ];
        description = "Sustainable serialisation library";
        license = stdenv.lib.licenses.bsd3;
@@ -218774,6 +219319,8 @@ self: {
        pname = "xml-conduit-parse";
        version = "0.3.1.2";
        sha256 = "0233jcpv7lzan2hh6siw2rrjkjp4f5i1kkpjpdfija01f8by3an1";
+       revision = "1";
+       editedCabalFile = "0jnnr4z3c6rq2dz0ldiic5zwkrp36igf6gip11qrm9ss2pk9khbl";
        libraryHaskellDepends = [
          base conduit conduit-parse containers exceptions parsers text
          xml-conduit xml-types
@@ -225120,8 +225667,8 @@ self: {
      }:
      mkDerivation {
        pname = "ztar";
-       version = "0.1.3";
-       sha256 = "12pzskr90a724x3wh1dsbpbszh6a58lbp4sxl7sd7s1bk3m2kgq1";
+       version = "0.2.0";
+       sha256 = "1y6kkfwx3aw2fi46r7dg4q84mbhl54f2x4vpvwvzd9alz1nvv90i";
        libraryHaskellDepends = [
          base bytestring deepseq directory filepath path process text
          unix-compat zip zlib
-- 
GitLab


From 1c48e89eb138c75ca8ebf95a6aa13078c03be9d5 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 21 Jul 2018 02:21:30 +0200
Subject: [PATCH 118/128] libtensorflow: init at 1.8.0

Required for haskell.packages.ghc822.tensorflow
---
 .../libraries/libtensorflow/default.nix       | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/libtensorflow/default.nix

diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix
new file mode 100644
index 00000000000..fce15b121b4
--- /dev/null
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, patchelf }:
+stdenv.mkDerivation rec {
+  pname = "libtensorflow";
+  version = "1.8.0";
+  name = "${pname}-${version}";
+  src = fetchurl {
+    url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-cpu-linux-x86_64-${version}.tar.gz";
+    sha256 = "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha";
+  };
+
+  # Patch library to use our libc, libstdc++ and others
+  buildCommand = ''
+    . $stdenv/setup
+    mkdir -pv $out
+    tar -C $out -xzf $src
+    chmod +w $out/lib/libtensorflow.so
+    chmod +w $out/lib/libtensorflow_framework.so
+    ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$out/lib" $out/lib/libtensorflow.so
+    ${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/libtensorflow_framework.so
+    chmod -w $out/lib/libtensorflow.so
+    chmod -w $out/lib/libtensorflow_framework.so
+  '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "C API for TensorFlow";
+    license = licenses.asl20;
+    maintainers = [maintainers.basvandijk];
+    platforms = platforms.linux;
+    homepage = https://www.tensorflow.org/versions/master/install/install_c;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc4caf5988f..3174dc66ca9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -860,6 +860,8 @@ with pkgs;
 
   tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
 
+  libtensorflow = callPackage ../development/libraries/libtensorflow { };
+
   blink1-tool = callPackage ../tools/misc/blink1-tool { };
 
   bliss = callPackage ../applications/science/math/bliss { };
-- 
GitLab


From 7b510c47e1de4dd9bd95ba41c7cc428b1ce7bbb7 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 21 Jul 2018 02:23:53 +0200
Subject: [PATCH 119/128] haskell: add extra dependencies of tensorflow-proto

---
 .../haskell-modules/configuration-hackage2nix.yaml            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e16ef73734b..06508c2b7b8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2392,6 +2392,7 @@ extra-packages:
   - http-conduit ^>= 2.2                # pre-lts-11.x versions neeed by git-annex 6.20180227
   - inline-c < 0.6                      # required on GHC 8.0.x
   - inline-c-cpp < 0.2                  # required on GHC 8.0.x
+  - lens-labels == 0.1.*                # required for proto-lens-descriptors
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
@@ -2399,6 +2400,9 @@ extra-packages:
   - persistent >=2.5 && <2.8            # pre-lts-11.x versions neeed by git-annex 6.20180227
   - persistent-sqlite < 2.7             # pre-lts-11.x versions neeed by git-annex 6.20180227
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
+  - proto-lens == 0.2.*                 # required for tensorflow-proto-0.1.x on GHC 8.2.x
+  - proto-lens-protoc == 0.2.*          # required for tensorflow-proto-0.1.x on GHC 8.2.x
+  - proto-lens-protobuf-types == 0.2.*  # required for tensorflow-proto-0.1.x on GHC 8.2.x
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
   - resourcet ==1.1.*                   # pre-lts-11.x versions neeed by git-annex 6.20180227
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
-- 
GitLab


From ab4bff2b7711aa0af882ae90930840546338b3ef Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 21 Jul 2018 02:25:13 +0200
Subject: [PATCH 120/128] haskell: fix build of tensorflow on GHC-8.2

---
 .../configuration-ghc-8.2.x.nix               | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index f73172e02d3..825b4f349f0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -96,4 +96,83 @@ self: super: {
     haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
   }));
 
+} // # All the following is needed to build tensorflow.
+(
+let
+  tensorflow-haskell = pkgs.fetchFromGitHub {
+    owner = "tensorflow";
+    repo = "haskell";
+    rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7";
+    sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8";
+    fetchSubmodules = true;
+  };
+in
+{
+  proto-lens-descriptors = super.proto-lens-descriptors.override {
+    proto-lens = self.proto-lens_0_2_2_0;
+    lens-labels = self.lens-labels_0_1_0_2;
+  };
+  proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override {
+    haskell-src-exts = self.haskell-src-exts_1_19_1;
+  };
+  proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override {
+    proto-lens = self.proto-lens_0_2_2_0;
+    proto-lens-protoc = self.proto-lens-protoc_0_2_2_3;
+  };
+  tensorflow-proto = (super.callPackage (
+    { mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types
+    , proto-lens-protoc, stdenv
+    }:
+    mkDerivation {
+      pname = "tensorflow-proto";
+      version = "0.1.0.0";
+      src = tensorflow-haskell;
+      setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+      libraryHaskellDepends = [
+        base proto-lens proto-lens-protobuf-types proto-lens-protoc
+      ];
+      libraryToolDepends = [ pkgs.protobuf ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "TensorFlow protocol buffers";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {
+    proto-lens = self.proto-lens_0_2_2_0;
+    proto-lens-protoc = self.proto-lens-protoc_0_2_2_3;
+    proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0;
+  }).overrideAttrs (_oldAttrs: {
+    sourceRoot = "source/tensorflow-proto";
+  });
+  tensorflow = (super.callPackage (
+    { mkDerivation, async, attoparsec, base, bytestring, c2hs
+    , containers, data-default, exceptions, fgl, HUnit, lens-family
+    , mainland-pretty, mtl, proto-lens, semigroups, split, stdenv
+    , temporary, libtensorflow, tensorflow-proto, test-framework
+    , test-framework-hunit, test-framework-quickcheck2, text
+    , transformers, vector
+    }:
+    mkDerivation {
+      pname = "tensorflow";
+      version = "0.1.0.2";
+      src = tensorflow-haskell;
+      libraryHaskellDepends = [
+        async attoparsec base bytestring containers data-default exceptions
+        fgl lens-family mainland-pretty mtl proto-lens semigroups split
+        temporary tensorflow-proto text transformers vector
+      ];
+      librarySystemDepends = [ libtensorflow ];
+      libraryToolDepends = [ c2hs ];
+      testHaskellDepends = [
+        attoparsec base bytestring HUnit lens-family proto-lens
+        tensorflow-proto test-framework test-framework-hunit
+        test-framework-quickcheck2
+      ];
+      homepage = "https://github.com/tensorflow/haskell#readme";
+      description = "TensorFlow bindings";
+      license = stdenv.lib.licenses.asl20;
+    }
+  ) {}).overrideAttrs (_oldAttrs: {
+    sourceRoot = "source/tensorflow";
+  });
 }
+)
-- 
GitLab


From 26b313accf38faf64bb974542f93013b98da091f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jul 2018 16:10:57 +0200
Subject: [PATCH 121/128] git-annex: update sha256 hash for the new version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c8d4000f234..0d9fb43be25 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -86,7 +86,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb";
+      sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
-- 
GitLab


From f7d201ea4d62ee493a06dfa1485b9a8e759b7e50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jul 2018 16:21:17 +0200
Subject: [PATCH 122/128] all-cabal-hashes: update snapshot to Hackage at
 2018-07-20T06:34:51Z

---
 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 8d9ba54c950..a8af8f791a9 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/e6e8a920e43237ccd2f66d6a349b5932a5eba1f5.tar.gz";
-  sha256 = "0xyw1a5fp6swyxsj79hihivq9fpzzvl4apv34399a1n4ch6qhbf3";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/92b4fe519b988dee70e2ef8f2f1d05edf610ba8a.tar.gz";
+  sha256 = "15sh85v57k635q5ir8pwa605cchj12h4sflss8zd1xshy7ywi673";
 }
-- 
GitLab


From dcd5d7af05eb7db180270af3953ab4498029a24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 21 Jul 2018 15:27:53 +0100
Subject: [PATCH 123/128] coursier: patch shebang to make it work in the nix
 sandboxes

Before `/usr/bin/env sh` was in the script.
---
 pkgs/development/tools/coursier/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index e3c8d7ed014..7e660f3fcd9 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   buildCommand = ''
     install -Dm555 $src $out/bin/coursier
+    patchShebangs $out/bin/coursier
     wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin
   '';
 
-- 
GitLab


From 8aaaf98045ec1ab72d897afba3eb92bf08fbd312 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jul 2018 16:51:55 +0200
Subject: [PATCH 124/128] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.10.1-7-ga1690c5 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/412c0df40472ebd7e8d740b5454f36a4340857cd.
---
 .../haskell-modules/hackage-packages.nix      | 155 ++++++++++++++++--
 1 file changed, 139 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1587e1df690..85355782171 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -35148,16 +35148,16 @@ self: {
      }) {};
 
   "bindings-sane" = callPackage
-    ({ mkDerivation, base, bindings-DSL, saneBackends }:
+    ({ mkDerivation, base, bindings-DSL, sane-backends }:
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ saneBackends ];
+       libraryPkgconfigDepends = [ sane-backends ];
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.lgpl3;
-     }) {inherit (pkgs) saneBackends;};
+     }) {inherit (pkgs) sane-backends;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -81595,7 +81595,7 @@ self: {
   "gi-dbusmenu" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
-     , libdbusmenu-glib, text, transformers
+     , libdbusmenu, text, transformers
      }:
      mkDerivation {
        pname = "gi-dbusmenu";
@@ -81606,11 +81606,11 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ libdbusmenu-glib ];
+       libraryPkgconfigDepends = [ libdbusmenu ];
        doHaddock = false;
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) libdbusmenu-glib;};
+     }) {inherit (pkgs) libdbusmenu;};
 
   "gi-dbusmenugtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -82291,7 +82291,8 @@ self: {
 
   "gi-xlib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, haskell-gi-overloading, text, transformers, x11
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
+     , xlibsWrapper
      }:
      mkDerivation {
        pname = "gi-xlib";
@@ -82302,11 +82303,11 @@ self: {
          base bytestring containers haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ x11 ];
+       libraryPkgconfigDepends = [ xlibsWrapper ];
        doHaddock = false;
        description = "xlib bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) x11;};
+     }) {inherit (pkgs) xlibsWrapper;};
 
   "giak" = callPackage
     ({ mkDerivation, async, base, bytestring, Cabal, containers
@@ -87681,7 +87682,7 @@ self: {
   "greenclip" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, exceptions
      , hashable, libXau, microlens, microlens-mtl, protolude, text, unix
-     , vector, wordexp, X11, x11, xcb, xdmcp
+     , vector, wordexp, X11, xcb, xdmcp, xlibsWrapper
      }:
      mkDerivation {
        pname = "greenclip";
@@ -87693,12 +87694,12 @@ self: {
          base binary bytestring directory exceptions hashable microlens
          microlens-mtl protolude text unix vector wordexp X11
        ];
-       executablePkgconfigDepends = [ libXau x11 xcb xdmcp ];
+       executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ];
        description = "Simple clipboard manager to be integrated with rofi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.xorg) libXau; inherit (pkgs) x11; xcb = null; 
-         xdmcp = null;};
+     }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; 
+         inherit (pkgs) xlibsWrapper;};
 
   "greg-client" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, hostname, network
@@ -88665,16 +88666,16 @@ self: {
      }) {};
 
   "gtk-traymanager" = callPackage
-    ({ mkDerivation, base, glib, gtk3, x11 }:
+    ({ mkDerivation, base, glib, gtk3, xlibsWrapper }:
      mkDerivation {
        pname = "gtk-traymanager";
        version = "1.0.1";
        sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di";
        libraryHaskellDepends = [ base glib gtk3 ];
-       libraryPkgconfigDepends = [ x11 ];
+       libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) x11;};
+     }) {inherit (pkgs) xlibsWrapper;};
 
   "gtk2hs-buildtools" = callPackage
     ({ mkDerivation, alex, array, base, Cabal, containers, directory
@@ -100856,6 +100857,8 @@ self: {
        pname = "hgeometry";
        version = "0.7.0.0";
        sha256 = "0c91n42l6pqkdw46snhplvzm8f05x0x5g3b7mgx13ndskcf9vmyz";
+       revision = "1";
+       editedCabalFile = "1wjwpfiic3jbhg77qm2nzgvybnpk0h3wwpywkpfxz8sv1yhb8pa2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -115424,6 +115427,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ihaskell_0_9_1_0" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+     , cmdargs, containers, directory, filepath, ghc, ghc-boot
+     , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
+     , hspec, hspec-contrib, http-client, http-client-tls, HUnit
+     , ipython-kernel, mtl, parsec, process, random, setenv, shelly
+     , split, stm, strict, system-argv0, text, transformers, unix
+     , unordered-containers, utf8-string, uuid, vector
+     }:
+     mkDerivation {
+       pname = "ihaskell";
+       version = "0.9.1.0";
+       sha256 = "1r71bijgfcsgsymg9aqjkgplg8c9g65zddr7dqf7d3mv2bpb5ain";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal cmdargs containers
+         directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
+         haskell-src-exts hlint http-client http-client-tls ipython-kernel
+         mtl parsec process random shelly split stm strict system-argv0 text
+         transformers unix unordered-containers utf8-string uuid vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory ghc ipython-kernel
+         process strict text transformers unix
+       ];
+       testHaskellDepends = [
+         base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
+         shelly text transformers
+       ];
+       description = "A Haskell backend kernel for the IPython project";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ihaskell-aeson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here
      , ihaskell, text
@@ -118687,6 +118726,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ipython-kernel_0_9_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, containers
+     , cryptonite, directory, filepath, memory, mtl, process, temporary
+     , text, transformers, unordered-containers, uuid, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "ipython-kernel";
+       version = "0.9.1.0";
+       sha256 = "0944riw00i3m8n3cab0g9c14b24xryf9w8ddlddnmxgys4sn8qak";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cereal containers cryptonite directory
+         filepath memory mtl process temporary text transformers
+         unordered-containers uuid zeromq4-haskell
+       ];
+       description = "A library for creating kernels for IPython frontends";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -170931,6 +170992,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "relude" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+     , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
+     , tasty-hedgehog, text, transformers, unordered-containers
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "relude";
+       version = "0.1.0";
+       sha256 = "16q9mh35c989pmy4xz602svfz57x2kbl8v82mjsapigmnxa41r8x";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq ghc-prim hashable mtl stm text
+         transformers unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
+         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
+         utf8-string
+       ];
+       benchmarkHaskellDepends = [
+         base containers gauge unordered-containers
+       ];
+       description = "Custom prelude from Kowainik";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "remark" = callPackage
     ({ mkDerivation, base, GenericPretty, tasty, tasty-golden
      , tasty-hunit
@@ -183939,6 +184025,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "simple-vec3_0_4_0_8" = callPackage
+    ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
+     , QuickCheck, tasty, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "simple-vec3";
+       version = "0.4.0.8";
+       sha256 = "0jikq60ixk21gb7j3rayxqha73m9vn4n8kz4799rcw5qiii7rr4a";
+       libraryHaskellDepends = [ base QuickCheck vector ];
+       testHaskellDepends = [
+         base doctest doctest-driver-gen tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "Three-dimensional vectors of doubles with basic operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-zipper" = callPackage
     ({ mkDerivation, base, hspec, lens }:
      mkDerivation {
@@ -198544,6 +198648,7 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {tensorflow = null;};
 
   "tensorflow-core-ops" = callPackage
@@ -198564,6 +198669,7 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -198591,6 +198697,7 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-opgen" = callPackage
@@ -198608,6 +198715,7 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -198637,6 +198745,7 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-proto" = callPackage
@@ -198652,6 +198761,7 @@ self: {
        libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
@@ -198668,6 +198778,7 @@ self: {
        ];
        description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-records-conduit" = callPackage
@@ -198684,6 +198795,7 @@ self: {
        ];
        description = "Conduit wrappers for TensorFlow.Records.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-test" = callPackage
@@ -209694,6 +209806,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "uploadtest" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "uploadtest";
+       version = "0.0.0";
+       sha256 = "17hi7ibasy0lhvzhv52k0dynvhxlsmywliymyygwk1jv740z1bdz";
+       libraryHaskellDepends = [ base ];
+       description = "Upload test";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "upskirt" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
-- 
GitLab


From a09d16229e214e6dbb4c03b0b1130192612aa011 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 08:05:27 -0700
Subject: [PATCH 125/128] xmr-stak: 2.4.5 -> 2.4.7

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xmr-stak/versions.
---
 pkgs/applications/misc/xmr-stak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index 05530af1254..f90173f3528 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
 
 stdenv'.mkDerivation rec {
   name = "xmr-stak-${version}";
-  version = "2.4.5";
+  version = "2.4.7";
 
   src = fetchFromGitHub {
     owner = "fireice-uk";
     repo = "xmr-stak";
     rev = "${version}";
-    sha256 = "0ix4vqhcm4x9j5p6pwdfwkm2ml6wmwsyn3ppzvxllhp4dj8blzwf";
+    sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
-- 
GitLab


From 932d2e4f94338b71fd5994e86919ba0295638571 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 08:09:01 -0700
Subject: [PATCH 126/128] znc: 1.7.0 -> 1.7.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/znc/versions.
---
 pkgs/applications/networking/znc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index b78c0ad09c3..80b1e9caeaa 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "znc-${version}";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "https://znc.in/releases/archive/${name}.tar.gz";
-    sha256 = "0vxra50418bsjfdpf8vl70fijv8syvasjqdxfyjliff6k91k2zn0";
+    sha256 = "1i1r1lh9q2mr1bg520zrvrlwhrhy6wibrin78wjxq1gab1qymks4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From b657f663ac631d85594006baead1e2cd7196e393 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 21 Jul 2018 09:56:00 -0700
Subject: [PATCH 127/128] subversion_1_10: 1.10.0 -> 1.10.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/subversion/versions.
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 8cbfe1ec161..fc98b398213 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -117,8 +117,8 @@ in {
   };
 
   subversion_1_10 = common {
-    version = "1.10.0";
-    sha256 = "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic";
+    version = "1.10.2";
+    sha256 = "127dysfc31q4dhbbxaznh9kqixy9jd44kgwji2gdwj6rb2lf6dav";
     extraBuildInputs = [ lz4 utf8proc ];
   };
 }
-- 
GitLab


From dddac8b684b9113666b2c6eee845c59ce4a867df Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Thu, 19 Jul 2018 00:34:32 -0700
Subject: [PATCH 128/128] gtk-doc: support python3

---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 32025edb306..8ec6aec9918 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   # Make six available for binaries, python.withPackages creates a wrapper
   # but scripts are not allowed in shebangs so we link it into sys.path.
   postInstall = ''
-    ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/
+    ln -s ${python.pkgs.six}/${python.sitePackages}/* $out/share/gtk-doc/python/
   '';
 
   doCheck = false; # requires a lot of stuff
-- 
GitLab